Skip to content

Re-export CMAKE_MODULE_PATH #532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Re-export CMAKE_MODULE_PATH #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d24e4f2
Reexport `CMAKE_MODULE_PATH`
threeal Jan 14, 2024
a7c6906
Update Catch2 example to use `catch_discover_tests`
threeal Jan 14, 2024
820a125
Fix formatting
threeal Jan 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions cmake/CPM.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,10 @@ 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.
Expand Down Expand Up @@ -815,6 +819,10 @@ 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()
Expand Down Expand Up @@ -986,6 +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(CPM_INDENT "${CPM_OLD_INDENT}")
endif()
endfunction()
Expand Down
4 changes: 3 additions & 1 deletion examples/catch2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)