diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/FindAGG.cmake | 11 | ||||
| -rw-r--r-- | modules/FindGObject.cmake | 25 | ||||
| -rw-r--r-- | modules/FindOpenEXR.cmake | 20 |
3 files changed, 26 insertions, 30 deletions
diff --git a/modules/FindAGG.cmake b/modules/FindAGG.cmake index b52814e6..ea7905bd 100644 --- a/modules/FindAGG.cmake +++ b/modules/FindAGG.cmake @@ -20,19 +20,18 @@ else (AGG_INCLUDE_DIR AND AGG_LIBRARIES) IF (NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls - INCLUDE(UsePkgConfig) + find_package(PkgConfig) + pkg_check_modules(AGG libagg) - PKGCONFIG(libagg _AGGIncDir _AGGLinkDir _AGGLinkFlags _AGGCflags) - - set(AGG_DEFINITIONS ${_AGGCflags}) + set(AGG_DEFINITIONS ${AGG_CFLAGS}) ENDIF (NOT WIN32) FIND_PATH(AGG_INCLUDE_DIR agg2/agg_pixfmt_gray.h - ${_AGGIncDir} + ${AGG_INCLUDE_DIRS} ) FIND_LIBRARY(AGG_LIBRARIES NAMES agg PATHS - ${_AGGLinkDir} + ${AGG_LIBRARY_DIRS} ) if (AGG_INCLUDE_DIR AND AGG_LIBRARIES) diff --git a/modules/FindGObject.cmake b/modules/FindGObject.cmake index 3d3d6b3d..3774b914 100644 --- a/modules/FindGObject.cmake +++ b/modules/FindGObject.cmake @@ -19,38 +19,37 @@ ENDIF (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES) IF (NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls - INCLUDE(UsePkgConfig) - PKGCONFIG(gobject-2.0 _GObjectIncDir _GObjectLinkDir _GObjectLinkFlags _GObjectCflags) - #MESSAGE(STATUS "DEBUG: GObject include directory = ${_GObjectIncDir}") - #MESSAGE(STATUS "DEBUG: GObject link directory = ${_GObjectLinkDir}") - #MESSAGE(STATUS "DEBUG: GObject link flags = ${_GObjectLinkFlags}") - #MESSAGE(STATUS "DEBUG: GObject CFlags = ${_GObjectCflags}") - SET(GOBJECT_DEFINITIONS ${_GObjectCflags}) + find_package(PkgConfig) + pkg_check_modules(GOBJECT gobject-2.0) + #MESSAGE(STATUS "DEBUG: GObject include directory = ${GOBJECT_INCLUDE_DIRS}") + #MESSAGE(STATUS "DEBUG: GObject link directory = ${GOBJECT_LIBRARY_DIRS}") + #MESSAGE(STATUS "DEBUG: GObject CFlags = ${GOBJECT_CFLAGS}") + SET(GOBJECT_DEFINITIONS ${GOBJECT_CFLAGS}) ENDIF (NOT WIN32) FIND_PATH(GOBJECT_INCLUDE_DIR gobject.h PATHS - ${_GObjectIncDir} - ${_GObjectIncDir}/glib-2.0/gobject/ + ${GOBJECT_INCLUDE_DIRS} + ${GOBJECT_INCLUDE_DIRS}/glib-2.0/gobject/ /usr/include/glib-2.0/gobject/ #PATH_SUFFIXES gst ) FIND_LIBRARY(_GObjectLibs NAMES gobject-2.0 PATHS - ${_GObjectLinkDir} + ${GOBJECT_LIBRARY_DIRS} ) FIND_LIBRARY(_GModuleLibs NAMES gmodule-2.0 PATHS - ${_GObjectLinkDir} + ${GOBJECT_LIBRARY_DIRS} ) FIND_LIBRARY(_GThreadLibs NAMES gthread-2.0 PATHS - ${_GObjectLinkDir} + ${GOBJECT_LIBRARY_DIRS} ) FIND_LIBRARY(_GLibs NAMES glib-2.0 PATHS - ${_GObjectLinkDir} + ${GOBJECT_LIBRARY_DIRS} ) SET( GOBJECT_LIBRARIES ${_GObjectLibs} ${_GModuleLibs} ${_GThreadLibs} ${_GLibs} ) diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index 35b7e001..7b7a03f0 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -20,18 +20,18 @@ else (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES) IF (NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls - INCLUDE(UsePkgConfig) - - PKGCONFIG(OpenEXR _OpenEXRIncDir _OpenEXRLinkDir _OpenEXRLinkFlags _OpenEXRCflags) + find_package(PkgConfig) + pkg_check_modules(OPENEXR OpenEXR) + ENDIF (NOT WIN32) FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h - ${_OpenEXRIncDir} + ${OPENEXR_INCLUDE_DIRS} PATH_SUFFIXES /OpenEXR/ ) FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half PATHS - ${_OpenEXRLinkDir} + ${OPENEXR_LIBRARY_DIRS} NO_DEFAULT_PATH ) FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half ) @@ -39,30 +39,28 @@ ENDIF (NOT WIN32) FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex PATHS - ${_OpenEXRLinkDir} + ${OPENEXR_LIBRARY_DIRS} NO_DEFAULT_PATH ) FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex ) FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath PATHS - ${_OpenEXRLinkDir} + ${OPENEXR_LIBRARY_DIRS} NO_DEFAULT_PATH ) FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath ) FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf PATHS - ${_OpenEXRLinkDir} + ${OPENEXR_LIBRARY_DIRS} NO_DEFAULT_PATH ) FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf ) FIND_LIBRARY(OPENEXR_ILMTHREAD_LIBRARY NAMES IlmThread PATHS - ${_OPENEXRLinkDir} - /usr/lib - /usr/local/lib + ${OPENEXR_LIBRARY_DIRS} ) if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) |