perf: simplify cmake scripts (#362)

Signed-off-by: msclock <msclock@qq.com>
serious-scaffold · Sep 6, 2024 · 292bab3 · 292bab3
1 parent 5f383ee
commit 292bab3
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 90 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,7 +21,7 @@ set(CMAKE_CXX_EXTENSIONS
 # Source includes from vcpkg
 include_directories(${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include)
 
-# From # https://github.com/msclock/cmake-registry.
+# From https://github.com/msclock/cmake-registry.
 find_package(cmake-modules REQUIRED)
 include(cmake-modules/ProjectDefault)
 
@@ -32,13 +32,4 @@ include(ConfigureVersion)
 include(ConfigureDocs)
 include(ConfigureCoverage)
 
-if(test IN_LIST VCPKG_MANIFEST_FEATURES)
-  include(ConfigureTest)
-endif()
-
 add_subdirectory(src)
-
-# Print project final information
-show_project_version()
-show_vcpkg_configuration()
-show_installation()
diff --git a/cmake/ConfigureTest.cmake b/cmake/ConfigureTest.cmake
diff --git a/template/CMakeLists.txt.jinja b/template/CMakeLists.txt.jinja
@@ -23,7 +23,7 @@ set(CMAKE_CXX_EXTENSIONS
 # Source includes from vcpkg
 include_directories(${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include)
 
-# From # https://github.com/msclock/cmake-registry.
+# From https://github.com/msclock/cmake-registry.
 find_package(cmake-modules REQUIRED)
 include(cmake-modules/ProjectDefault)
 
@@ -40,13 +40,4 @@ include(ConfigureCPMDependencies)
 include(ConfigureConanDependencies)
 [%- endif %]
 
-if(test IN_LIST VCPKG_MANIFEST_FEATURES)
-  include(ConfigureTest)
-endif()
-
 add_subdirectory(src)
-
-# Print project final information
-show_project_version()
-show_vcpkg_configuration()
-show_installation()
diff --git a/template/cmake/ConfigureTest.cmake b/template/cmake/ConfigureTest.cmake
diff --git a/template/vcpkg.json.jinja b/template/vcpkg.json.jinja
@@ -45,7 +45,7 @@
 [%- endif %]
     {
       "name": "cmake-modules",
-      "version": "1.5.9"
+      "version": "1.6.1"
     },
     {
       "name": "robotology-cmake-ycm",
@@ -67,7 +67,7 @@
     "registries": [
       {
         "kind": "git",
-        "baseline": "d6e6813c7076b97bf2c03b91e38e851159483867",
+        "baseline": "20d38479da92baeddc74c7de8aa9d3453ee38aa5",
         "repository": "https://github.com/msclock/cmake-registry",
         "packages": [
 [%- if use_conan == true %]

diff --git a/vcpkg.json b/vcpkg.json
@@ -22,7 +22,7 @@
     },
     {
       "name": "cmake-modules",
-      "version": "1.5.9"
+      "version": "1.6.1"
     },
     {
       "name": "robotology-cmake-ycm",
@@ -44,7 +44,7 @@
     "registries": [
       {
         "kind": "git",
-        "baseline": "d6e6813c7076b97bf2c03b91e38e851159483867",
+        "baseline": "20d38479da92baeddc74c7de8aa9d3453ee38aa5",
         "repository": "https://github.com/msclock/cmake-registry",
         "packages": [
           "cmake-modules",