diff options
Diffstat (limited to 'cmake/modules/FindGTK2.cmake')
| -rw-r--r-- | cmake/modules/FindGTK2.cmake | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/cmake/modules/FindGTK2.cmake b/cmake/modules/FindGTK2.cmake index db69a7a..58e8af4 100644 --- a/cmake/modules/FindGTK2.cmake +++ b/cmake/modules/FindGTK2.cmake @@ -3,15 +3,15 @@ FILE(TO_CMAKE_PATH "${GTK2_DIR}" TRY2_DIR) FILE(GLOB GTK_DIR ${TRY1_DIR} ${TRY2_DIR}) FIND_PATH(GTK_gtk_2_INCLUDE_DIR gtk/gtk.h - PATHS ${GTK_DIR}/include /usr/local/include /usr/include + PATHS ${GTK_DIR}/include /usr/local/include/gtk-2.0 /usr/include/gtk-2.0 ENV INCLUDE DOC "Directory containing gtk/gtk.h include file") FIND_PATH(GTK_gdk_2_INCLUDE_DIR gdk/gdk.h - PATHS ${GTK_DIR}/include /usr/local/include /usr/include + PATHS ${GTK_DIR}/include /usr/local/include/gtk-2.0 /usr/include/gtk-2.0 ENV INCLUDE DOC "Directory containing gdk/gdk.h include file") FIND_PATH(GTK_gdkconfig_2_INCLUDE_DIR gdkconfig.h - PATHS ${GTK_DIR}/include ${GTK_DIR}/lib/include /usr/local/include /usr/include + PATHS ${GTK_DIR}/include ${GTK_DIR}/lib/include /usr/local/include/gtk-2.0 /usr/include/gtk-2.0 /usr/lib/gtk-2.0/include /usr/local/lib/gtk-2.0/include ENV INCLUDE DOC "Directory containing gdkconfig.h include file") FIND_LIBRARY(GTK_gdk_pixbuf_2_LIBRARY NAMES gdk_pixbuf-2.0 @@ -20,24 +20,25 @@ FIND_LIBRARY(GTK_gdk_pixbuf_2_LIBRARY NAMES gdk_pixbuf-2.0 DOC "gdk_pixbuf library to link with" NO_SYSTEM_ENVIRONMENT_PATH) -FIND_LIBRARY(GTK_gdk_win32_2_LIBRARY NAMES gdk-win32-2.0 - PATHS ${GTK_DIR}/lib ${GTK_DIR}/bin ${GTK_DIR}/win32/bin ${GTK_DIR}/lib ${GTK_DIR}/win32/lib +FIND_LIBRARY(GTK_gdk_2_LIBRARY NAMES gdk-win32-2.0 gdk-x11-2.0 + PATHS ${GTK_DIR}/lib ${GTK_DIR}/bin ${GTK_DIR}/win32/bin ${GTK_DIR}/lib ${GTK_DIR}/win32/lib /usr/lib /usr/local/lib ENV LIB - DOC "gdk-win32 library to link with" + DOC "gdk2 library to link with" NO_SYSTEM_ENVIRONMENT_PATH) -FIND_LIBRARY(GTK_gtk_win32_2_LIBRARY NAMES gtk-win32-2.0 - PATHS ${GTK_DIR}/lib ${GTK_DIR}/bin ${GTK_DIR}/win32/bin ${GTK_DIR}/lib ${GTK_DIR}/win32/lib +FIND_LIBRARY(GTK_gtk_2_LIBRARY NAMES gtk-win32-2.0 gtk-x11-2.0 + PATHS ${GTK_DIR}/lib ${GTK_DIR}/bin ${GTK_DIR}/win32/bin ${GTK_DIR}/lib ${GTK_DIR}/win32/lib /usr/lib /usr/local/lib ENV LIB - DOC "gtk-win32 library to link with" - NO_SYSTEM_ENVIRONMENT_PATH) + DOC "gtk2 library to link with" + NO_SYSTEM_ENVIRONMENT_PATH) + IF (GTK_gtk_2_INCLUDE_DIR AND GTK_gdk_2_INCLUDE_DIR AND GTK_gdkconfig_2_INCLUDE_DIR AND - GTK_gdk_pixbuf_2_LIBRARY AND GTK_gdk_win32_2_LIBRARY AND GTK_gtk_win32_2_LIBRARY) + GTK_gdk_pixbuf_2_LIBRARY AND GTK_gdk_2_LIBRARY AND GTK_gtk_2_LIBRARY) SET(GTK2_INCLUDE_DIR ${GTK_gtk_2_INCLUDE_DIR} ${GTK_gdk_2_INCLUDE_DIR} ${GTK_gdkconfig_2_INCLUDE_DIR}) list(REMOVE_DUPLICATES GTK2_INCLUDE_DIR) - SET(GTK2_LIBRARIES ${GTK_gdk_pixbuf_2_LIBRARY} ${GTK_gdk_win32_2_LIBRARY} ${GTK_gtk_win32_2_LIBRARY}) + SET(GTK2_LIBRARIES ${GTK_gdk_pixbuf_2_LIBRARY} ${GTK_gdk_2_LIBRARY} ${GTK_gtk_2_LIBRARY}) list(REMOVE_DUPLICATES GTK2_LIBRARIES) SET(GTK2_FOUND TRUE) ENDIF (GTK_gtk_2_INCLUDE_DIR AND GTK_gdk_2_INCLUDE_DIR AND GTK_gdkconfig_2_INCLUDE_DIR AND - GTK_gdk_pixbuf_2_LIBRARY AND GTK_gdk_win32_2_LIBRARY AND GTK_gtk_win32_2_LIBRARY) + GTK_gdk_pixbuf_2_LIBRARY AND GTK_gdk_2_LIBRARY AND GTK_gtk_2_LIBRARY) |