From 710568fb286e882db2376560dcd2c2d275e1bf63 Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 2 Feb 2014 12:31:06 +0100 Subject: [PATCH] HAVE_GTK -> HAVE_GTK2 --- dtool/LocalSetup.cmake | 2 +- dtool/Package.cmake | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dtool/LocalSetup.cmake b/dtool/LocalSetup.cmake index 43c626dcc7..0e64a6eeb6 100644 --- a/dtool/LocalSetup.cmake +++ b/dtool/LocalSetup.cmake @@ -307,7 +307,7 @@ else() message("- Did not find SpeedTree") endif() -if(HAVE_GTK) +if(HAVE_GTK2) message("+ gtk+-2") else() message("- Did not find gtk+-2") diff --git a/dtool/Package.cmake b/dtool/Package.cmake index 7a56ce1edb..35447f9dab 100644 --- a/dtool/Package.cmake +++ b/dtool/Package.cmake @@ -23,9 +23,8 @@ package_option(FREETYPE) set(Freetype_FIND_QUIETLY TRUE) # Fix for builtin FindGTK2 set(GTK2_GTK_FIND_QUIETLY TRUE) # Fix for builtin FindGTK2 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_package(wxWidgets QUIET)