use CPM.cmake module to fetch project_options

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.16...3.23)
 
 # Not ideal to use this global variable, but necessary to make sure
 # that tooling and projects use the same version
@@ -22,11 +22,20 @@ set(OPT_WARNINGS_AS_ERRORS_DEVELOPER_DEFAULT TRUE)
 
 # Add project_options v0.17.0
 # https://github.com/cpp-best-practices/project_options
-include(FetchContent)
-FetchContent_Declare(_project_options
-                     URL https://github.com/cpp-best-practices/project_options/archive/refs/tags/v0.17.0.zip)
-FetchContent_MakeAvailable(_project_options)
-include(${_project_options_SOURCE_DIR}/Index.cmake)
+# include(FetchContent)
+# FetchContent_Declare(_project_options
+#                      URL https://github.com/cpp-best-practices/project_options/archive/refs/tags/v0.17.0.zip)
+# FetchContent_MakeAvailable(_project_options)
+# include(${_project_options_SOURCE_DIR}/Index.cmake)
+
+# ---- Add dependencies via CPM ----
+# see https://github.com/cpm-cmake/CPM.cmake for more info
+include(cmake/CPM.cmake)
+
+# Add project_options v0.18.0, but my version! CK
+# https://github.com/cpp-best-practices/project_options
+CPMAddPackage("gh:ClausKlein/cmakelib#865af7a1339c03cc8b3cab0d3dcd01ec789f456c")
+list(APPEND CMAKE_MODULE_PATH ${ProjectOptions_SRC_DIR})
 
 # uncomment to enable vcpkg:
 # # Setup vcpkg - should be called before defining project()
@@ -71,7 +80,7 @@ if(BUILDING_MULTI_CONFIG)
   endif()
 endif()
 
-include(${_project_options_SOURCE_DIR}/src/DynamicProjectOptions.cmake)
+include(DynamicProjectOptions)
 
 # defaulted_project_options sets recommended defaults and provides user and developer
 # modes and full GUI support for choosing options at configure time
@@ -92,6 +101,7 @@ dynamic_project_options(
   PCH_HEADERS
   <vector>
   <string> # This is a list of headers to pre-compile, here are some common ones
+  ENABLE_CONAN
   # CONAN_OPTIONS    # Extra options to pass to conan
   # MSVC_WARNINGS    # Override the defaults for the MSVC warnings
   # CLANG_WARNINGS   # Override the defaults for the CLANG warnings

cmake/CPM.cmake

@@ -0,0 +1,20 @@
+set(CPM_DOWNLOAD_VERSION 0.35.0)
+
+if(CPM_SOURCE_CACHE)
+  # Expand relative path. This is important if the provided path contains a tilde (~)
+  get_filename_component(CPM_SOURCE_CACHE ${CPM_SOURCE_CACHE} ABSOLUTE)
+  set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
+elseif(DEFINED ENV{CPM_SOURCE_CACHE})
+  set(CPM_DOWNLOAD_LOCATION "$ENV{CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
+else()
+  set(CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
+endif()
+
+if(NOT (EXISTS ${CPM_DOWNLOAD_LOCATION}))
+  message(STATUS "Downloading CPM.cmake to ${CPM_DOWNLOAD_LOCATION}")
+  file(DOWNLOAD https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake
+       ${CPM_DOWNLOAD_LOCATION}
+  )
+endif()
+
+include(${CPM_DOWNLOAD_LOCATION})

conanfile.txt

@@ -5,8 +5,8 @@ catch2/2.13.8
 docopt.cpp/0.6.3
 fmt/8.1.1
 spdlog/1.9.2
-sdl/2.0.20
-fltk/1.3.8
+#XXX sdl/2.0.20
+#XXX fltk/1.3.8
 
 [generators]
 cmake_find_package_multi

src/CMakeLists.txt

@@ -1,5 +1,5 @@
-add_subdirectory(sdl)
-add_subdirectory(fltk)
+#XXX add_subdirectory(sdl)
+#XXX add_subdirectory(fltk)
 
 find_package(fmt CONFIG)
 find_package(spdlog CONFIG)

test/CMakeLists.txt

@@ -1,6 +1,6 @@
 find_package(Catch2 REQUIRED)
 
-include(CTest)
+#XXX include(CTest)
 include(Catch)
 
 add_library(catch_main OBJECT catch_main.cpp)