diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2013-10-06 19:58:18 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2013-10-06 19:58:18 +0000 |
| commit | c73bbc615009c4e0a44ad45079c01390f68d9415 (patch) | |
| tree | be8b1ce3fc5a26e67baff7703a7ab51a25a25a5a /cmake | |
| parent | 00c8690599651f59844ced80e25bb1f159a1b549 (diff) | |
Make FindGTK3 work again
svn path=/trunk/; revision=52416
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindGTK3.cmake | 45 |
1 files changed, 24 insertions, 21 deletions
diff --git a/cmake/modules/FindGTK3.cmake b/cmake/modules/FindGTK3.cmake index 9ac76c8ccf..2c0dd5d566 100644 --- a/cmake/modules/FindGTK3.cmake +++ b/cmake/modules/FindGTK3.cmake @@ -36,27 +36,30 @@ PKG_CHECK_MODULES(PC_GTK3 gtk+-3.0 QUIET) SET(GTK3_DEFINITIONS ${PC_GTK3_CFLAGS_OTHER}) -FIND_PATH(GTK3_INCLUDE_DIR - NAMES - "gtk/gtk.h" - "gtk.h" - HINTS - ${GTK3_HINTS}/include - ${PC_GTK3_INCLUDEDIR} - ${PC_GTK3_INCLUDE_DIRS} - PATH_SUFFIXES - "gtk-3.0" - ) - -FIND_LIBRARY(GTK3_LIBRARY - NAMES - gtk-3 gtk3 - HINTS - ${GTK3_HINTS}/lib - ${PC_GTK3_LIBDIR} - ${PC_GTK3_LIBRARY_DIRS} - ) - +if( NOT PC_GTK3_FOUND ) + FIND_PATH(GTK3_INCLUDE_DIR + NAMES + "gtk/gtk.h" + "gtk.h" + HINTS + ${GTK3_HINTS}/include + ${PC_GTK3_INCLUDEDIR} + ${PC_GTK3_INCLUDE_DIRS} + PATH_SUFFIXES + "gtk-3.0" + ) + FIND_LIBRARY(GTK3_LIBRARY + NAMES + gtk-3 gtk3 + HINTS + ${GTK3_HINTS}/lib + ${PC_GTK3_LIBDIR} + ${PC_GTK3_LIBRARY_DIRS} + ) +else() + set( GTK3_LIBRARY ${PC_GTK3_LIBRARIES} ) + set( GTK3_INCLUDE_DIRS ${PC_GTK3_INCLUDEDIR} ${PC_GTK3_INCLUDE_DIRS} ) +endif() # handle the QUIETLY and REQUIRED arguments and set GTK3_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) |