diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2013-10-04 15:10:27 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2013-10-04 15:10:27 +0000 |
| commit | 325d8315eae51c940591320c5acd649fa59cff7c (patch) | |
| tree | 02d377d5aedb83047e00acbe2bff477cb3508481 /cmake | |
| parent | 319d0fb4d295baf3d5f751c8487fdd77a7e47ca6 (diff) | |
Detecting these modules finally works on Windows setup
svn path=/trunk/; revision=52361
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindGMODULE2.cmake | 4 | ||||
| -rw-r--r-- | cmake/modules/FindGTHREAD2.cmake | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmake/modules/FindGMODULE2.cmake b/cmake/modules/FindGMODULE2.cmake index 06171c2ace..aedc71b14d 100644 --- a/cmake/modules/FindGMODULE2.cmake +++ b/cmake/modules/FindGMODULE2.cmake @@ -29,9 +29,9 @@ ELSE() PKG_SEARCH_MODULE( GMODULE2 ${_pkgconfig_REQUIRED} gmodule-2.0 ) ENDIF() -IF( NOT GMODULE2_FOUND AND NOT PKG_CONFIG_FOUND ) +IF( NOT GMODULE2_FOUND ) INCLUDE( FindWSWinLibs ) - FindWSWinLibs( "gtk2" "GMODULE2_HINTS" ) + FindWSWinLibs( "gtk[23]" "GMODULE2_HINTS" ) FIND_PATH( GMODULE2_INCLUDE_DIRS NAMES gmodule.h diff --git a/cmake/modules/FindGTHREAD2.cmake b/cmake/modules/FindGTHREAD2.cmake index 18fd5ab792..ae5a7a45a1 100644 --- a/cmake/modules/FindGTHREAD2.cmake +++ b/cmake/modules/FindGTHREAD2.cmake @@ -29,9 +29,9 @@ ELSE() PKG_SEARCH_MODULE( GTHREAD2 ${_pkgconfig_REQUIRED} gthread-2.0 ) ENDIF() -IF( NOT GTHREAD2_FOUND AND NOT PKG_CONFIG_FOUND ) +IF( NOT GTHREAD2_FOUND ) INCLUDE(FindWSWinLibs) - FindWSWinLibs("gtk2" "GTHREAD2_HINTS") + FindWSWinLibs("gtk[23]" "GTHREAD2_HINTS") FIND_PATH( GTHREAD2_INCLUDE_DIRS gthread.h PATH_SUFFIXES glib-2.0 glib GLib.framework/Headers/glib glib-2.0/glib HINTS "${GTHREAD2_HINTS}/include" ) IF( APPLE ) FIND_LIBRARY( GTHREAD2_LIBRARIES glib ) |