Skip to content

add include guard for spiner #73

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

Closed
Yurlungur wants to merge 3 commits into from
Closed

add include guard for spiner #73

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
c6b1222
add include guard for spiner
jonahm-LANL Jun 2, 2026
e4e1f9a
try this
jonahm-LANL Jun 2, 2026
ea739be
try this
jonahm-LANL Jun 2, 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
4 changes: 3 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 3 additions & 1 deletion test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ 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()
# 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")
Expand Down
Loading