From d24e4f267cbab47ca9efca6f21f2c376bff21353 Mon Sep 17 00:00:00 2001 From: Alfi Maulana Date: Sun, 14 Jan 2024 18:25:33 +0700 Subject: [PATCH 1/3] Reexport `CMAKE_MODULE_PATH` --- cmake/CPM.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/CPM.cmake b/cmake/CPM.cmake index f4d0eea4..ca8c3302 100644 --- a/cmake/CPM.cmake +++ b/cmake/CPM.cmake @@ -756,6 +756,7 @@ function(CPMAddPackage) "${CPM_ARGS_SYSTEM}" "${CPM_ARGS_OPTIONS}" ) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} PARENT_SCOPE) set(PACKAGE_INFO "${PACKAGE_INFO} at ${download_directory}") # As the source dir is already cached/populated, we override the call to FetchContent. @@ -815,6 +816,7 @@ function(CPMAddPackage) "${CPM_ARGS_SYSTEM}" "${CPM_ARGS_OPTIONS}" ) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} PARENT_SCOPE) endif() cpm_get_fetch_properties("${CPM_ARGS_NAME}") endif() @@ -986,6 +988,7 @@ function( set(CPM_OLD_INDENT "${CPM_INDENT}") set(CPM_INDENT "${CPM_INDENT} ${PACKAGE}:") add_subdirectory(${SOURCE_DIR} ${BINARY_DIR} ${addSubdirectoryExtraArgs}) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} PARENT_SCOPE) set(CPM_INDENT "${CPM_OLD_INDENT}") endif() endfunction() From a7c69068c09bb85a744052026d8c6a41b32fcb2d Mon Sep 17 00:00:00 2001 From: Alfi Maulana Date: Sun, 14 Jan 2024 18:31:12 +0700 Subject: [PATCH 2/3] Update Catch2 example to use `catch_discover_tests` --- examples/catch2/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/catch2/CMakeLists.txt b/examples/catch2/CMakeLists.txt index f4d3e226..2e171ae2 100644 --- a/examples/catch2/CMakeLists.txt +++ b/examples/catch2/CMakeLists.txt @@ -17,5 +17,7 @@ target_compile_features(CPMExampleCatch2 PRIVATE cxx_std_17) # ---- Enable testing ---- +include(Catch) + enable_testing() -add_test(CPMExampleCatch2 CPMExampleCatch2) +catch_discover_tests(CPMExampleCatch2) From 820a12538455a35966855c7b0679090a3ab0585f Mon Sep 17 00:00:00 2001 From: Alfi Maulana Date: Sun, 14 Jan 2024 19:06:52 +0700 Subject: [PATCH 3/3] Fix formatting --- cmake/CPM.cmake | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/cmake/CPM.cmake b/cmake/CPM.cmake index ca8c3302..d43f4436 100644 --- a/cmake/CPM.cmake +++ b/cmake/CPM.cmake @@ -756,7 +756,10 @@ function(CPMAddPackage) "${CPM_ARGS_SYSTEM}" "${CPM_ARGS_OPTIONS}" ) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} PARENT_SCOPE) + set(CMAKE_MODULE_PATH + ${CMAKE_MODULE_PATH} + PARENT_SCOPE + ) set(PACKAGE_INFO "${PACKAGE_INFO} at ${download_directory}") # As the source dir is already cached/populated, we override the call to FetchContent. @@ -816,7 +819,10 @@ function(CPMAddPackage) "${CPM_ARGS_SYSTEM}" "${CPM_ARGS_OPTIONS}" ) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} PARENT_SCOPE) + set(CMAKE_MODULE_PATH + ${CMAKE_MODULE_PATH} + PARENT_SCOPE + ) endif() cpm_get_fetch_properties("${CPM_ARGS_NAME}") endif() @@ -988,7 +994,10 @@ function( set(CPM_OLD_INDENT "${CPM_INDENT}") set(CPM_INDENT "${CPM_INDENT} ${PACKAGE}:") add_subdirectory(${SOURCE_DIR} ${BINARY_DIR} ${addSubdirectoryExtraArgs}) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} PARENT_SCOPE) + set(CMAKE_MODULE_PATH + ${CMAKE_MODULE_PATH} + PARENT_SCOPE + ) set(CPM_INDENT "${CPM_OLD_INDENT}") endif() endfunction()