Merge branch 'cpm-fixes' into 'master'

[cpm] Boost header only and skip formatting targets

See merge request ogs/ogs!3501

scripts/cmake/Dependencies.cmake

@@ -130,7 +130,13 @@ CPMFindPackage(
     NAME Boost
     GITHUB_REPOSITORY Orphis/boost-cmake
     VERSION ${ogs.minimum_version.boost}
+    DOWNLOAD_ONLY YES
 )
+if(Boost_ADDED)
+    add_library(Boost::boost INTERFACE IMPORTED)
+    string(REPLACE "." "_" boost_version ${ogs.minimum_version.boost})
+    target_include_directories(Boost::boost SYSTEM INTERFACE ${Boost_SOURCE_DIR}/boost/boost_${boost_version})
+endif()
 
 if(OGS_USE_XDMF)
     # ZLIB is a HDF5 dependency
@@ -313,10 +319,19 @@ configure_file(${PROJECT_SOURCE_DIR}/scripts/cmake/test/CTestCustom.in.cmake
     ${PROJECT_BINARY_DIR}/CTestCustom.cmake @ONLY
 )
 
-CPMAddPackage(
-  NAME Format.cmake
-  VERSION 1.7.0
-  GITHUB_REPOSITORY TheLartians/Format.cmake
-  OPTIONS
-    "CMAKE_FORMAT_EXCLUDE scripts/cmake/CPM.cmake|.*/Tests.cmake|scripts/cmake/jedbrown/.*|scripts/cmake/conan/conan.cmake|scripts/cmake/vector-of-bool/.*"
-)
+find_program(CLANG_FORMAT_PROGRAM clang-format)
+find_program(CMAKE_FORMAT_PROGRAM cmake-format)
+
+if(CLANG_FORMAT_PROGRAM OR CMAKE_FORMAT_PROGRAM)
+    if(NOT CMAKE_FORMAT_PROGRAM)
+        set(skip_cmake "FORMAT_SKIP_CMAKE YES")
+    endif()
+    CPMAddPackage(
+      NAME Format.cmake
+      VERSION 1.7.0
+      GITHUB_REPOSITORY TheLartians/Format.cmake
+      OPTIONS
+        ${skip_cmake}
+        "CMAKE_FORMAT_EXCLUDE scripts/cmake/CPM.cmake|.*/Tests.cmake|scripts/cmake/jedbrown/.*|scripts/cmake/conan/conan.cmake|scripts/cmake/vector-of-bool/.*"
+    )
+endif()