Sfoglia il codice sorgente

HAVE_GTK -> HAVE_GTK2

rdb 12 anni fa
parent
commit
710568fb28
2 ha cambiato i file con 3 aggiunte e 4 eliminazioni
  1. 1 1
      dtool/LocalSetup.cmake
  2. 2 3
      dtool/Package.cmake

+ 1 - 1
dtool/LocalSetup.cmake

@@ -307,7 +307,7 @@ else()
   message("- Did not find SpeedTree")
   message("- Did not find SpeedTree")
 endif()
 endif()
 
 
-if(HAVE_GTK)
+if(HAVE_GTK2)
   message("+ gtk+-2")
   message("+ gtk+-2")
 else()
 else()
   message("- Did not find gtk+-2")
   message("- Did not find gtk+-2")

+ 2 - 3
dtool/Package.cmake

@@ -23,9 +23,8 @@ package_option(FREETYPE)
 set(Freetype_FIND_QUIETLY TRUE) # Fix for builtin FindGTK2
 set(Freetype_FIND_QUIETLY TRUE) # Fix for builtin FindGTK2
 set(GTK2_GTK_FIND_QUIETLY TRUE) # Fix for builtin FindGTK2
 set(GTK2_GTK_FIND_QUIETLY TRUE) # Fix for builtin FindGTK2
 find_package(GTK2 QUIET COMPONENTS gtk)
 find_package(GTK2 QUIET COMPONENTS gtk)
-set(GTK_FOUND ${GTK2_FOUND}) # Mangle for convenience
-#config_package(GTK "gtk+-2")
-package_option(GTK)
+#config_package(GTK2 "gtk+-2")
+package_option(GTK2)
 
 
 # Find and configure WxWidgets
 # Find and configure WxWidgets
 find_package(wxWidgets QUIET)
 find_package(wxWidgets QUIET)