Merge pull request #146 from PeterBowman/missing-cmake-next-paths

Add CMake 3.9+ stuff to module path on YCM load
robotology · Jun 6, 2018 · 9e2c204 · 9e2c204
2 parents 8d87a34 + bbc4c1d
commit 9e2c204
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/YCMConfig.cmake.in b/YCMConfig.cmake.in
@@ -51,14 +51,12 @@ if(YCM_USE_CMAKE_NEXT)
     list(APPEND YCM_MODULE_PATH "${YCM_MODULE_DIR}/cmake-next/Modules")
 endif()
 
-foreach(_version 3.8
+foreach(_version 3.11
+                 3.10
+                 3.9
+                 3.8
                  3.7
-                 3.6
-                 3.5
-                 3.4
-                 3.3
-                 3.2
-                 3.1)
+                 3.6)
   if(EXISTS "${YCM_MODULE_DIR}/cmake-${_version}"
      AND CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS ${_version}
      AND CMAKE_VERSION VERSION_LESS ${_version})

diff --git a/cmake-next/CMakeLists.txt b/cmake-next/CMakeLists.txt
@@ -92,7 +92,7 @@ endfunction()
 
 
 # Downloaded modules               CMake Version   Uncommitted
-#                                  Version         Changes
+#                                                  Changes
 #
 #  FindMatlab                       3.7
 #  FeatureSummary                   3.8
@@ -108,6 +108,8 @@ endfunction()
 # Changes in dependencies
 #  FindPackageHandleStandardArgs
 
+# NOTE: keep CMake version values listed at root/YCMConfig.cmake.in up
+# to date with changes in the previous table.
 
 
 ################################################################################