From 2d5d1400be58d86a6b42be1dad98b141be74422e Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Thu, 24 May 2018 18:33:15 -0600 Subject: [PATCH] CMake: Remove references to WxWidgets/FLTK The plugin once used these; it's since been deprecated, so we don't be needing GUI toolkits anymore. --- dtool/LocalSetup.cmake | 12 ------------ dtool/Package.cmake | 28 ---------------------------- 2 files changed, 40 deletions(-) diff --git a/dtool/LocalSetup.cmake b/dtool/LocalSetup.cmake index c671ec7080..a8cee40f6c 100644 --- a/dtool/LocalSetup.cmake +++ b/dtool/LocalSetup.cmake @@ -206,18 +206,6 @@ else() message("- Did not find gtk+-2") endif() -if(HAVE_WX) - message("+ WxWidgets") -else() - message("- Did not find WxWidgets") -endif() - -if(HAVE_FLTK) - message("+ FLTK") -else() - message("- Did not find FLTK") -endif() - if(HAVE_GL) message("+ OpenGL") else() diff --git a/dtool/Package.cmake b/dtool/Package.cmake index b2935ce165..ae3afb0789 100644 --- a/dtool/Package.cmake +++ b/dtool/Package.cmake @@ -255,34 +255,6 @@ package_option(PhysX config_package(PhysX "Nvidia PhysX") -# Find and configure WxWidgets -find_package(wxWidgets QUIET) -if(WXWIDGETS_FOUND) - set(WX_FOUND TRUE) # Mangle for convenience -endif() -# Cleanup after builtin FindWx -mark_as_advanced(wxWidgets_CONFIG_EXECUTABLE) -mark_as_advanced(wxWidgets_wxrc_EXECUTABLE) -#config_package(WX "WxWidgets") -package_option(WX) - -# Find and configure FLTK -set(OpenGL_FIND_QUIETLY TRUE) # Fix for builtin FindFLTK -find_package(FLTK QUIET) -mark_as_advanced(FLTK_BASE_LIBRARY) # Cleanup after builtin FLTK -mark_as_advanced(FLTK_CONFIG_SCRIPT) # Cleanup after builtin FLTK -mark_as_advanced(FLTK_FLUID_EXECUTABLE) # Cleanup after builtin FLTK -mark_as_advanced(FLTK_FORMS_LIBRARY) # Cleanup after builtin FLTK -mark_as_advanced(FLTK_GL_LIBRARY) # Cleanup after builtin FLTK -mark_as_advanced(FLTK_IMAGES_LIBRARY) # Cleanup after builtin FLTK -mark_as_advanced(FLTK_INCLUDE_DIR) # Cleanup after builtin FLTK -#config_package(FLTK) -package_option(FLTK) - -# Cleanup after builtin FindFLTK -mark_as_advanced(FLTK_DIR) -mark_as_advanced(FLTK_MATH_LIBRARY) - ######## # TODO #