CMake: Clean out a few old TODOs and comments

dtool/Config.cmake

@@ -442,26 +442,6 @@ that is built into Panda. TinyDisplay is not as full-featured as Mesa
 but is many times faster." ${IS_NOT_MINSIZE_BUILD})
 
 
-# TODO: OpenGL ES
-# Is OpenGL ES 1.x installed, and where?
-#find_package(OpenGLES)
-
-#package_option(GLES
-#  "Enable OpenGL ES 1.x support, a minimal subset of
-#OpenGL for mobile devices.")
-
-# Is OpenGL ES 2.x installed, and where?
-#find_package(OpenGLES)
-
-#package_option(GLES2
-#  "Enable OpenGL ES 2.x support, a version of OpenGL ES but without
-#fixed-function pipeline - everything is programmable there.")
-
-# Is EGL installed, and where?
-#package_option(EGL
-#  "Enable EGL support. EGL is like GLX, but for OpenGL ES.")
-
-
 # Is SDL installed, and where?
 set(Threads_FIND_QUIETLY TRUE) # Fix for builtin FindSDL
 set(Eigen3_FIND_QUIETLY TRUE) # Fix for builtin FindSDL
@@ -482,26 +462,6 @@ mark_as_advanced(SDL_LIBRARY)
 mark_as_advanced(SDL_LIBRARY_TEMP)
 
 
-# TODO: XF86DGA
-# This defines if we have XF86DGA installed.
-#find_package(XF86DGA QUIET)
-
-#package_option(XF86DGA
-#  "This enables smooth FPS-style mouse in x11display,
-#when mouse mode M_relative is used.")
-
-
-# TODO: XRANDR
-#find_package(Xrandr QUIET)
-#package_option(XRANDR
-#  "This enables resolution switching in x11display.")
-
-
-# TODO: XCURSOR
-#find_package(Xcursor QUIET)
-#package_option(XCURSOR
-#  "This enables custom cursor support in x11display.")
-
 if(HAVE_GL AND HAVE_X11 AND NOT APPLE)
   option(HAVE_GLX "Enables GLX. Requires OpenGL and X11." ON)
 else()
@@ -524,15 +484,6 @@ cmake_dependent_option(HAVE_COCOA "Enable Cocoa. Requires Mac OS X." ON
 cmake_dependent_option(HAVE_CARBON "Enable Carbon. Requires Mac OS X." OFF
   "APPLE" OFF)
 
-#
-# <<<<<< Insert the rest of the Config.pp
-#        port of third-party libs here <<<<<<<
-#
-
-
-
-
-
 #
 # Miscellaneous settings
 #
@@ -582,16 +533,6 @@ mark_as_advanced(HAVE_SGI_RGB HAVE_TGA
   HAVE_IMG HAVE_SOFTIMAGE_PIC HAVE_BMP HAVE_PNM)
 
 
-#
-# <<<<< Insert the rest of the Config.pp
-#       port of miscellaneous settings here <<<<<
-#
-
-
-
-
-
-
 # How to invoke bison and flex.  Panda takes advantage of some
 # bison/flex features, and therefore specifically requires bison and
 # flex, not some other versions of yacc and lex.  However, you only
@@ -610,12 +551,6 @@ set(HAVE_BISON ${BISON_FOUND})
 set(HAVE_FLEX ${FLEX_FOUND})
 
 
-#
-# >>>>> Below is entirely temporary config information
-#       until the port of Config.pp is finished.
-#       It should be re-arranged for above. >>>>>>
-#
-
 ### Configure threading support ###
 set(CMAKE_THREAD_PREFER_PTHREAD ON)
 set(THREADS_PREFER_PTHREAD_FLAG ON)
@@ -634,11 +569,7 @@ slightly slow down Panda for the single CPU case."
   IMPORTED_AS Threads::Threads)
 
 # Configure debug threads
-if(CMAKE_BUILD_TYPE MATCHES "Debug")
-  option(DEBUG_THREADS "If on, enables debugging of thread and sync operations (i.e. mutexes, deadlocks)" ON)
-else()
-  option(DEBUG_THREADS "If on, enables debugging of thread and sync operations (i.e. mutexes, deadlocks)" OFF)
-endif()
+option(DEBUG_THREADS "If on, enables debugging of thread and sync operations (i.e. mutexes, deadlocks)" ${IS_DEBUG_BUILD})
 
 option(SIMPLE_THREADS
   "If on, compile with simulated threads.  Threads, by default, use

dtool/LocalSetup.cmake

@@ -155,52 +155,6 @@ endif()
 # Now go through all the packages and report whether we have them.
 show_packages()
 
-if(HAVE_TINYDISPLAY)
-  message("+ Tinydisplay")
-else()
-  message("- Not building Tinydisplay")
-endif()
-
-if(HAVE_AWESOMIUM)
-  message("+ AWESOMIUM")
-else()
-  message("- Did not find AWESOMIUM")
-endif()
-
-if(HAVE_MAYA)
-  message("+ OpenMaya")
-else()
-  message("- Did not find OpenMaya")
-endif()
-
-if(HAVE_FCOLLADA)
-  message("+ FCollada")
-else()
-  message("- Did not find FCollada")
-endif()
-
-if(HAVE_ASSIMP)
-  message("+ Assimp")
-else()
-  message("- Did not find Assimp")
-endif()
-
-if(HAVE_ROCKET)
-  if(HAVE_ROCKET_PYTHON)
-    message("+ libRocket with Python bindings")
-  else()
-    message("+ libRocket without Python bindings")
-  endif()
-else()
-  message("- Did not find libRocket")
-endif()
-
-if(HAVE_VORBIS)
-  message("+ libvorbis (Ogg Vorbis Decoder)")
-else()
-  message("- Did not find libvorbis (Ogg Vorbis Decoder)")
-endif()
-
 message("")
 if(INTERROGATE_PYTHON_INTERFACE)
   message("Compilation will generate Python interfaces for Python ${PYTHON_VERSION_STRING}.")

dtool/Package.cmake

@@ -488,59 +488,3 @@ package_option(ARTOOLKIT
   "Enable support for ARToolKit.  This will be built into the 'vision' package.")
 
 package_status(ARTOOLKIT "ARToolKit")
-
-########
-# TODO #
-########
-
-# Find and configure Awesomium
-#find_package(Awesomium)
-#package_status(AWESOMIUM COMMENT "Awesomium")
-
-# Find and configure OpenMaya
-#find_package(OpenMaya)
-#package_status(MAYA COMMENT "OpenMaya")
-
-# Find and configure FCollada
-#find_package(FCollada)
-#package_status(FCOLLADA COMMENT "FCollada")
-#if(FOUND_COLLADA14DOM OR FOUND_COLLADA15DOM)
-# set(USE_COLLADA TRUE CACHE BOOL "If true, compile Panda3D with COLLADA DOM")
-# if(USE_COLLADA)
-#   if(FOUND_COLLADA15DOM)
-#     set(HAVE_COLLADA15DOM TRUE)
-#   else()
-#     set(HAVE_COLLADA14DOM TRUE)
-#   endif()
-# endif()
-#endif()
-
-# Find and configure Assimp
-#find_package(Assimp)
-#package_status(ASSIMP COMMENT "Assimp")
-
-# Find and configure libRocket
-#find_package(Rocket)
-#package_status(ROCKET COMMENT "libRocket")
-#if(HAVE_ROCKET AND HAVE_PYTHON)
-# # Check for rocket python bindings
-# if(FOUND_ROCKET_PYTHON)
-#   option(USE_ROCKET_PYTHON "If on, compile Panda3D with python bindings for libRocket" ON)
-#   if(USE_ROCKET_PYTHON)
-#     set(HAVE_ROCKET_PYTHON TRUE)
-#   endif()
-#   else()
-#       unset(USE_ROCKET_PYTHON CACHE)
-# endif()
-# if(HAVE_ROCKET_PYTHON)
-#   message(STATUS "+ libRocket with Python bindings")
-# else()
-#   message(STATUS "+ libRocket without Python bindings")
-# endif()
-#else()
-# unset(USE_ROCKET_PYTHON CACHE)
-#endif()
-
-# Find and configure Vorbis
-#find_package(Vorbis)
-#package_status(VORBIS COMMENT "Vorbis Ogg decoder")