diff options
| -rw-r--r-- | modules/FindGLIB2.cmake | 24 | ||||
| -rw-r--r-- | modules/FindPopplerQt4.cmake | 19 |
2 files changed, 22 insertions, 21 deletions
diff --git a/modules/FindGLIB2.cmake b/modules/FindGLIB2.cmake index 431f2e5e..09fd98d8 100644 --- a/modules/FindGLIB2.cmake +++ b/modules/FindGLIB2.cmake @@ -16,25 +16,27 @@ if(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES) set(GLIB2_FIND_QUIETLY TRUE) endif(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES) -if (NOT WIN32) - include(UsePkgConfig) - pkgconfig(glib-2.0 _LibGLIB2IncDir _LibGLIB2LinkDir _LibGLIB2LinkFlags _LibGLIB2Cflags) -endif(NOT WIN32) +find_package(PkgConfig) +pkg_check_modules(PC_LibGLIB2 QUIET glib-2.0) -find_path(GLIB2_MAIN_INCLUDE_DIR glib.h - PATH_SUFFIXES glib-2.0 - PATHS ${_LibGLIB2IncDir} ) +find_path(GLIB2_MAIN_INCLUDE_DIR + NAMES glib.h + HINTS ${PC_LibGLIB2_INCLUDEDIR} + PATH_SUFFIXES glib-2.0) -# search the glibconfig.h include dir under the same root where the library is found -find_library(GLIB2_LIBRARIES +find_library(GLIB2_LIBRARY NAMES glib-2.0 - PATHS ${_LibGLIB2LinkDir} ) + HINTS ${PC_LibGLIB2_LIBDIR} +) + +set(GLIB2_LIBRARIES ${GLIB2_LIBRARY}) +# search the glibconfig.h include dir under the same root where the library is found get_filename_component(glib2LibDir "${GLIB2_LIBRARIES}" PATH) find_path(GLIB2_INTERNAL_INCLUDE_DIR glibconfig.h PATH_SUFFIXES glib-2.0/include - PATHS ${_LibGLIB2IncDir} "${glib2LibDir}" ${CMAKE_SYSTEM_LIBRARY_PATH}) + HINTS ${PC_LibGLIB2_INCLUDEDIR} "${glib2LibDir}" ${CMAKE_SYSTEM_LIBRARY_PATH}) set(GLIB2_INCLUDE_DIR "${GLIB2_MAIN_INCLUDE_DIR}") diff --git a/modules/FindPopplerQt4.cmake b/modules/FindPopplerQt4.cmake index 04911bbd..f2a59b8c 100644 --- a/modules/FindPopplerQt4.cmake +++ b/modules/FindPopplerQt4.cmake @@ -16,25 +16,24 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -if(NOT WIN32) - include(UsePkgConfig) +find_package(PkgConfig) +pkg_check_modules(PC_POPPLERQT4 QUIET poppler-qt4) - pkgconfig(poppler-qt4 _PopplerQt4IncDir _PopplerQt4LinkDir _PopplerQt4LinkFlags _PopplerQt4Cflags) +set(POPPLER_QT4_DEFINITIONS ${PC_POPPLERQT4_CFLAGS_OTHER}) - set(POPPLER_QT4_DEFINITIONS ${_PopplerQt4Cflags}) -endif(NOT WIN32) - -find_path(POPPLER_QT4_INCLUDE_DIR +find_path(POPPLER_QT4_INCLUDE_DIR NAMES poppler-qt4.h + HINTS ${PC_POPPLERQT4_INCLUDEDIR} PATH_SUFFIXES poppler/qt4 poppler - HINTS ${_PopplerQt4IncDir} ) -find_library(POPPLER_QT4_LIBRARIES +find_library(POPPLER_QT4_LIBRARY NAMES poppler-qt4 - HINTS ${_PopplerQt4LinkDir} + HINTS ${PC_POPPLERQT4_LIBDIR} ) +set(POPPLER_QT4_LIBRARIES ${POPPLER_QT4_LIBRARY}) + if (POPPLER_QT4_INCLUDE_DIR AND POPPLER_QT4_LIBRARIES) set(POPPLER_QT4_FOUND TRUE) else (POPPLER_QT4_INCLUDE_DIR AND POPPLER_QT4_LIBRARIES) |