Unverified Commit f2f22df8 authored by OpenSceneGraph git repository's avatar OpenSceneGraph git repository Committed by GitHub
Browse files

Merge pull request #930 from scttgs0/topic-pkgconfig-findpackage

Improve PkgConfig usage
parents 69d382d4 89450b7e
......@@ -8,14 +8,10 @@
# correspond to the ./configure --prefix=$GTA_DIR
# used in building libgta.
INCLUDE(FindPkgConfig OPTIONAL)
find_package(PkgConfig QUIET)
IF(PKG_CONFIG_FOUND)
INCLUDE(FindPkgConfig)
PKG_CHECK_MODULES(GTA gta)
ENDIF(PKG_CONFIG_FOUND)
IF(NOT GTA_FOUND)
......@@ -54,4 +50,4 @@ IF(NOT GTA_FOUND)
SET(GTA_FOUND "YES")
ENDIF(GTA_LIBRARIES AND GTA_INCLUDE_DIRS)
ENDIF(NOT GTA_FOUND)
\ No newline at end of file
ENDIF(NOT GTA_FOUND)
#use pkg-config to find various modues
INCLUDE(FindPkgConfig OPTIONAL)
find_package(PkgConfig QUIET)
IF(PKG_CONFIG_FOUND)
INCLUDE(FindPkgConfig)
PKG_CHECK_MODULES(GTK gtk+-2.0)
IF(WIN32)
......
#use pkg-config to find various modues
INCLUDE(FindPkgConfig OPTIONAL)
find_package(PkgConfig QUIET)
IF(PKG_CONFIG_FOUND)
INCLUDE(FindPkgConfig)
PKG_CHECK_MODULES(CAIRO cairo)
PKG_CHECK_MODULES(POPPLER poppler-glib)
......
#use pkg-config to find various modues
INCLUDE(FindPkgConfig OPTIONAL)
find_package(PkgConfig QUIET)
IF(PKG_CONFIG_FOUND)
INCLUDE(FindPkgConfig)
#Version 2.35 introduces the rsvg_cleanup function which is used
PKG_CHECK_MODULES(RSVG librsvg-2.0>=2.35)
......@@ -14,5 +11,4 @@ IF(PKG_CONFIG_FOUND)
SET(RSVG_FOUND FALSE)
ENDIF()
ENDIF()
......@@ -185,7 +185,7 @@ ELSE()
ELSEIF(${OSG_WINDOWING_SYSTEM} STREQUAL "X11")
# X11 for everybody else
INCLUDE(FindPkgConfig OPTIONAL)
find_package(PkgConfig QUIET)
IF(PKG_CONFIG_FOUND)
PKG_CHECK_MODULES(XRANDR xrandr)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment