Remove deprecated and modules that are already in upstream CMake (#401)

robotology · Apr 7, 2022 · 478fd94 · 478fd94
1 parent b4bef08
commit 478fd94
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 233 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Removed
 * Removed `FindEigen3.cmake` module (https://github.com/robotology/ycm/pull/399).
+* Removed `FindGSL.cmake`, `FindGLUT.cmake`, `FindOpenGL.cmake` and `YCMDefaultDirs.cmake`. The first three are available in CMake, while the last one has been deprecated for a long time (https://github.com/robotology/ycm/pull/401).
 
 ## [Unreleased Patch]
 

diff --git a/deprecated/CMakeLists.txt b/deprecated/CMakeLists.txt
@@ -7,11 +7,11 @@ mark_as_advanced(YARP_NO_DEPRECATED)
 # Deprecated modules installed for compatibility
 if(NOT YCM_NO_DEPRECATED)
   set(YCM_DEPRECATED_FILES
-    FindGLUT.cmake
-    YCMDefaultDirs.cmake
   )
-  _ycm_install(deprecated FILES ${YCM_DEPRECATED_FILES}
-                          DESTINATION "${YCM_INSTALL_MODULE_DIR}/deprecated")
+  if(YCM_DEPRECATED_FILES)
+    _ycm_install(deprecated FILES ${YCM_DEPRECATED_FILES}
+                            DESTINATION "${YCM_INSTALL_MODULE_DIR}/deprecated")
+  endif()
 
   # Print a warning if we are overriding some module from CMake
   foreach(_module IN LISTS YCM_DEPRECATED_FILES)

diff --git a/deprecated/FindGLUT.cmake b/deprecated/FindGLUT.cmake
diff --git a/deprecated/YCMDefaultDirs.cmake b/deprecated/YCMDefaultDirs.cmake
diff --git a/find-modules/CMakeLists.txt b/find-modules/CMakeLists.txt
@@ -14,7 +14,6 @@ set(YCM_FIND_MODULES FindACE.cmake
                      FindGLM.cmake
                      FindGooCanvas.cmake
                      FindGooCanvasMM.cmake
-                     FindGSL.cmake
                      FindGtkDatabox.cmake
                      FindGtkDataboxMM.cmake
                      FindI2C.cmake
@@ -29,7 +28,6 @@ set(YCM_FIND_MODULES FindACE.cmake
                      FindNVIDIACg.cmake
                      FindODE.cmake
                      FindOpenCV.cmake
-                     FindOpenGL.cmake
                      FindOpenNI.cmake
                      FindOpenNI2.cmake
                      FindPLXCANAPI.cmake

diff --git a/find-modules/FindGSL.cmake b/find-modules/FindGSL.cmake
diff --git a/find-modules/FindOpenGL.cmake b/find-modules/FindOpenGL.cmake