Update cmake-format config file

Format all cmake files.

Update CPM.cmake version.

Use FILE_SET HEADER to verify and install the header files.

Prevent build problems caused by CPM_USE_LOCAL_PACKAGES

Prevent problems with doctest if local found

Author: ClausKlein

CMakeLists.txt

@@ -23,9 +23,9 @@ endif()
 
 include(cmake/CPM.cmake)
 
-# PackageProject.cmake will be used to make our target installable XXX
-# CPMAddPackage("gh:TheLartians/PackageProject.cmake@1.13.0")
+# PackageProject.cmake will be used to make our target installable
 include(cmake/PackageProject.cmake)
+# XXX # CPMAddPackage("gh:TheLartians/PackageProject.cmake@1.13.0")
 
 # XXX set(CMAKE_SKIP_INSTALL_RULES YES)
 
@@ -88,6 +88,8 @@ endif()
 # ---- Create an installable target ----
 # this allows users to install and find the library via `find_package()`.
 
+include(cmake/AddUninstallTarget.cmake)
+
 packageProject(
   NAME ${PROJECT_NAME}
   VERSION ${PROJECT_VERSION}

README.md

@@ -44,7 +44,7 @@ This template is the result of learnings from many previous projects and should
 Eventually, you can remove any unused files, such as the standalone directory or irrelevant github workflows for your project.
 Feel free to replace the License with one suited for your project.
 
-To cleanly separate the library and subproject code, the outer `CMakeList.txt` only defines the library itself while the tests and other subprojects are self-contained in their own directories. 
+To cleanly separate the library and subproject code, the outer `CMakeList.txt` only defines the library itself while the tests and other subprojects are self-contained in their own directories.
 During development it is usually convenient to [build all subprojects at once](#build-everything-at-once).
 
 ### Build and run the standalone target
@@ -66,7 +66,7 @@ cmake -S test -B build/test
 cmake --build build/test
 CTEST_OUTPUT_ON_FAILURE=1 cmake --build build/test --target test
 
-# or simply call the executable: 
+# or simply call the executable:
 ./build/test/GreeterTests
 ```
 
@@ -91,7 +91,7 @@ See [Format.cmake](https://github.com/TheLartians/Format.cmake) for details.
 These dependencies can be easily installed using pip.
 
 ```bash
-pip install clang-format==14.0.6 cmake_format==0.6.11 pyyaml
+pip install cmake clang-format cmake_format==0.6.11 pyyaml
 ```
 
 ### Build the documentation

cmake/AddUninstallTarget.cmake

@@ -1,6 +1,5 @@
-# SPDX-FileCopyrightText: 2012-2021 Istituto Italiano di Tecnologia (IIT)
-# SPDX-FileCopyrightText: 2008-2013 Kitware Inc.
-# SPDX-License-Identifier: BSD-3-Clause
+# SPDX-FileCopyrightText: 2012-2021 Istituto Italiano di Tecnologia (IIT) SPDX-FileCopyrightText:
+# 2008-2013 Kitware Inc. SPDX-License-Identifier: BSD-3-Clause
 
 #[=======================================================================[.rst:
 AddUninstallTarget
@@ -27,14 +26,13 @@ your project using ``add_subdirectory`` (for example when using it with
 If the ``uninstall`` target already exists, the module does nothing.
 #]=======================================================================]
 
-
 # AddUninstallTarget works only when included in the main CMakeLists.txt
 if(NOT "${CMAKE_CURRENT_BINARY_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
   return()
 endif()
 
-# The name of the target is uppercase in MSVC and Xcode (for coherence with the
-# other standard targets)
+# The name of the target is uppercase in MSVC and Xcode (for coherence with the other standard
+# targets)
 if("${CMAKE_GENERATOR}" MATCHES "^(Visual Studio|Xcode)")
   set(_uninstall "UNINSTALL")
 else()
@@ -46,11 +44,11 @@ if(TARGET ${_uninstall})
   return()
 endif()
 
-
 set(_filename cmake_uninstall.cmake)
 
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/${_filename}"
-"if(NOT EXISTS \"${CMAKE_CURRENT_BINARY_DIR}/install_manifest.txt\")
+file(
+  WRITE "${CMAKE_CURRENT_BINARY_DIR}/${_filename}"
+  "if(NOT EXISTS \"${CMAKE_CURRENT_BINARY_DIR}/install_manifest.txt\")
   message(WARNING \"Cannot find install manifest: \\\"${CMAKE_CURRENT_BINARY_DIR}/install_manifest.txt\\\"\")
   return()
 endif()
@@ -73,20 +71,31 @@ foreach(file \${files})
     message(STATUS \"Not-found: \$ENV{DESTDIR}\${file}\")
   endif()
 endforeach(file)
-")
+"
+)
 
 set(_desc "Uninstall the project...")
 if(CMAKE_GENERATOR STREQUAL "Unix Makefiles")
-  set(_comment COMMAND \$\(CMAKE_COMMAND\) -E cmake_echo_color --switch=$\(COLOR\) --cyan "${_desc}")
+  set(_comment
+      COMMAND
+      \$\(CMAKE_COMMAND\)
+      -E
+      cmake_echo_color
+      --switch=$\(COLOR\)
+      --cyan
+      "${_desc}"
+  )
 else()
   set(_comment COMMENT "${_desc}")
 endif()
-add_custom_target(${_uninstall}
-                  ${_comment}
-                  COMMAND ${CMAKE_COMMAND} -P ${_filename}
-                  USES_TERMINAL
-                  BYPRODUCTS uninstall_byproduct
-                  WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+add_custom_target(
+  ${_uninstall}
+  ${_comment}
+  COMMAND ${CMAKE_COMMAND} -P ${_filename}
+  USES_TERMINAL
+  BYPRODUCTS uninstall_byproduct
+  WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+)
 set_property(SOURCE uninstall_byproduct PROPERTY SYMBOLIC 1)
 
 set_property(TARGET ${_uninstall} PROPERTY FOLDER "CMakePredefinedTargets")

cmake/CPM.cmake

@@ -2,8 +2,8 @@
 #
 # SPDX-FileCopyrightText: Copyright (c) 2019-2023 Lars Melchior and contributors
 
-set(CPM_DOWNLOAD_VERSION 0.40.6)
-set(CPM_HASH_SUM "3440292907e35353bf0761049d3680e9ed0031443c8ebeb9cbb6a421c4550ec1")
+set(CPM_DOWNLOAD_VERSION 0.40.7)
+set(CPM_HASH_SUM "c0fc82149e00c43a21febe7b2ca57b2ffea2b8e88ab867022c21d6b81937eb50")
 
 if(CPM_SOURCE_CACHE)
   set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")

standalone/CMakeLists.txt

@@ -16,7 +16,11 @@ CPMAddPackage(
   OPTIONS "CXXOPTS_BUILD_EXAMPLES NO" "CXXOPTS_BUILD_TESTS NO" "CXXOPTS_ENABLE_INSTALL YES"
 )
 
-CPMAddPackage(NAME Greeter SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/..)
+CPMAddPackage(
+  NAME Greeter
+  SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/..
+  FORCE ON
+)
 
 # ---- Create standalone executable ----
 

test/CMakeLists.txt

@@ -21,7 +21,11 @@ CPMAddPackage("gh:TheLartians/Format.cmake@1.8.3")
 if(TEST_INSTALLED_VERSION)
   find_package(Greeter REQUIRED)
 else()
-  CPMAddPackage(NAME Greeter SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/..)
+  CPMAddPackage(
+    NAME Greeter
+    SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/..
+    FORCE ON
+  )
 endif()
 
 # ---- Create binary ----
@@ -49,8 +53,13 @@ enable_testing()
 # testing frameworks add the tests target instead: add_test(NAME ${PROJECT_NAME} COMMAND
 # ${PROJECT_NAME})
 
-include(${doctest_SOURCE_DIR}/scripts/cmake/doctest.cmake)
-doctest_discover_tests(${PROJECT_NAME})
+# prevent problems if CPM_USE_LOCAL_PACKAGES is set:
+if(EXISTS ${doctest_SOURCE_DIR}/scripts/cmake/doctest.cmake)
+  include(${doctest_SOURCE_DIR}/scripts/cmake/doctest.cmake)
+  doctest_discover_tests(${PROJECT_NAME})
+else()
+  add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME})
+endif
 
 # ---- code coverage ----