From c6b122200c83eb5b142ee3aa523a6c1b2a81895e Mon Sep 17 00:00:00 2001 From: Jonah Miller Date: Tue, 2 Jun 2026 12:00:01 -0400 Subject: [PATCH 1/3] add include guard for spiner --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 79ae778..3d920c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,7 +65,9 @@ else() message(STATUS "HDF5 not enabled. Turning it off in spiner") set(SPINER_USE_HDF OFF CACHE BOOL "") endif() -add_subdirectory(utils/spiner) +if (NOT TARGET spiner::spiner) + add_subdirectory(utils/spiner) +endif() target_link_libraries(singularity-opac::flags INTERFACE spiner) include(GNUInstallDirs) From e4e1f9abb4bccd7003c189a6e0e9ce77d1239795 Mon Sep 17 00:00:00 2001 From: Jonah Miller Date: Tue, 2 Jun 2026 12:05:58 -0400 Subject: [PATCH 2/3] try this --- test/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 27c4eee..7adbee1 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -21,8 +21,8 @@ if(NOT Catch2_FOUND) GIT_REPOSITORY https://github.com/catchorg/Catch2.git GIT_TAG v2.13.10) FetchContent_MakeAvailable(Catch2) - list(APPEND CMAKE_MODULE_PATH ${Catch2_SOURCE_DIR}/contrib) endif() +list(APPEND CMAKE_MODULE_PATH ${Catch2_SOURCE_DIR}/contrib) # Build tests message(STATUS "Configuring unit tests") From ea739bea4ba57d3442aedfdc74635da076c90ae3 Mon Sep 17 00:00:00 2001 From: Jonah Miller Date: Tue, 2 Jun 2026 12:11:58 -0400 Subject: [PATCH 3/3] try this --- test/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 7adbee1..29d86ae 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -22,7 +22,9 @@ if(NOT Catch2_FOUND) GIT_TAG v2.13.10) FetchContent_MakeAvailable(Catch2) endif() +# TODO(JMM) This is gross and bad. Fix when we update to catch2/v3 list(APPEND CMAKE_MODULE_PATH ${Catch2_SOURCE_DIR}/contrib) +list(APPEND CMAKE_MODULE_PATH ${Catch2_SOURCE_DIR}/extras) # Build tests message(STATUS "Configuring unit tests")