diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-10-13 18:59:23 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-10-13 18:59:23 +0000 |
| commit | 3118bd5198c9b351aa2c938b3a28eefd30783127 (patch) | |
| tree | 59e66f99ac348361f898492f8a4f70d6fa2e948a /cmake | |
| parent | 76d4b43a292ec42aeb91e7c81169ef1d017c6b17 (diff) | |
Don't clobber PKG_CONFIG_PATH.
svn path=/trunk/; revision=52589
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindGTK3.cmake | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/cmake/modules/FindGTK3.cmake b/cmake/modules/FindGTK3.cmake index a8c7dd5ba2..239cb1b07b 100644 --- a/cmake/modules/FindGTK3.cmake +++ b/cmake/modules/FindGTK3.cmake @@ -23,13 +23,22 @@ INCLUDE(FindWSWinLibs) FindWSWinLibs("gtk3" "GTK3_HINTS") +if(DEFINED GTK3_HINTS) + if (DEFINED ENV{PKG_CONFIG_PATH}) + set( ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:{GTK3_HINTS}/lib/pkgconfig" ) + else() + set( ENV{PKG_CONFIG_PATH} "${GTK3_HINTS}/lib/pkgconfig" ) + endif() +endif() + # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls FIND_PACKAGE(PkgConfig) -set( ENV{PKG_CONFIG_PATH} ${GTK3_HINTS}/lib/pkgconfig ) PKG_CHECK_MODULES(PC_GTK3 gtk+-3.0 QUIET) +# MESSAGE(STATUS "PC_GTK3_INCLUDEDIR: ${PC_GTK3_INCLUDEDIR}") +# MESSAGE(STATUS "PC_GTK3_INCLUDE_DIRS: ${PC_GTK3_INCLUDE_DIRS}") # MESSAGE(STATUS "PC_GTK3_LIBRARIES: ${PC_GTK3_LIBRARIES}") # MESSAGE(STATUS "PC_GTK3_LIBRARY_DIRS: ${PC_GTK3_LIBRARY_DIRS}") # MESSAGE(STATUS "PC_GTK3_LDFLAGS: ${PC_GTK3_LDFLAGS}") |