Skip to content

fix test/CMakeLists.txt #87

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

Merged
97gamjak merged 3 commits into from
Mar 8, 2026
Merged

fix test/CMakeLists.txt #87

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
a39f556
fix test/CMakeLists.txt
Mar 4, 2026
2111f1f
fix: improve Catch2 submodule initialization in CMakeLists.txt
Mar 7, 2026
58851d3
Update changelog to reflect CMakeLists.txt changes for Catch2 submodu…
Mar 7, 2026
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.

## Next Release

- Update test/CMakeLists.txt to implicitly take care of including the Catch2 submodule

<!-- insertion marker -->
## [0.1.0](https://github.com/repo/owner/releases/tag/0.1.0) - 2026-02-27

Expand Down
42 changes: 37 additions & 5 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,45 @@ if(NOT TARGET mstd)
endif()

if(NOT TARGET Catch2::Catch2WithMain)
add_subdirectory(
"${MSTD_ROOT_DIR}/external/Catch2"
"${CMAKE_CURRENT_BINARY_DIR}/external/Catch2"
)
set(MSTD_CATCH2_SOURCE_DIR "${MSTD_ROOT_DIR}/external/Catch2")
if(EXISTS "${MSTD_CATCH2_SOURCE_DIR}/CMakeLists.txt")
add_subdirectory(
"${MSTD_CATCH2_SOURCE_DIR}"
"${CMAKE_CURRENT_BINARY_DIR}/external/Catch2"
)
else()
find_package(Git QUIET)
if(GIT_FOUND)
message(STATUS "Catch2 submodule missing. Attempting initialization via git...")
execute_process(
COMMAND "${GIT_EXECUTABLE}" submodule update --init --recursive -- external/Catch2
WORKING_DIRECTORY "${MSTD_ROOT_DIR}"
RESULT_VARIABLE MSTD_CATCH2_SUBMODULE_RESULT
ERROR_VARIABLE MSTD_CATCH2_SUBMODULE_ERROR
)
else()
set(MSTD_CATCH2_SUBMODULE_RESULT 1)
set(MSTD_CATCH2_SUBMODULE_ERROR "Git executable was not found.")
endif()

if(EXISTS "${MSTD_CATCH2_SOURCE_DIR}/CMakeLists.txt")
add_subdirectory(
"${MSTD_CATCH2_SOURCE_DIR}"
"${CMAKE_CURRENT_BINARY_DIR}/external/Catch2"
)
else()
message(FATAL_ERROR
"Catch2 submodule is missing at '${MSTD_CATCH2_SOURCE_DIR}'.\n"
"Automatic submodule initialization failed (code: ${MSTD_CATCH2_SUBMODULE_RESULT}).\n"
"Details: ${MSTD_CATCH2_SUBMODULE_ERROR}\n"
"Please run manually and re-run CMake:\n"
" git submodule update --init --recursive"
)
endif()
endif()
endif()

list(APPEND CMAKE_MODULE_PATH "${MSTD_ROOT_DIR}/external/Catch2/extras")
list(APPEND CMAKE_MODULE_PATH "${MSTD_CATCH2_SOURCE_DIR}/extras")

if(NOT TARGET mstd_test_support)
add_library(mstd_test_support INTERFACE)
Expand Down