Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 ApplicationLibCode/UnitTests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,18 @@ FetchContent_Declare(
GIT_TAG release-1.11.0
)

set(BUILD_GMOCK
OFF
CACHE BOOL "" FORCE
)
set(BUILD_GTEST
ON
CACHE BOOL "" FORCE
)
set(INSTALL_GTEST
OFF
CACHE BOOL "" FORCE
)
FetchContent_MakeAvailable(googletest)

# ##############################################################################
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ FetchContent_Declare(
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG release-1.11.0
)

set(BUILD_GMOCK OFF CACHE BOOL "" FORCE)
set(BUILD_GTEST ON CACHE BOOL "" FORCE)
set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
FetchContent_MakeAvailable(googletest)

set(THREADS_PREFER_PTHREAD_FLAG ON)
Expand Down
11 changes: 9 additions & 2 deletions ThirdParty/custom-surfio/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,13 @@ FetchContent_Declare(
GIT_REPOSITORY https://github.com/kokkos/mdspan.git
GIT_TAG 9ceface91483775a6c74d06ebf717bbb2768452f # mdspan-0.6.0
)
FetchContent_MakeAvailable(mdspan)

# Disable install for mdspan by excluding it from INSTALL_ALL
FetchContent_GetProperties(mdspan)
if(NOT mdspan_POPULATED)
FetchContent_Populate(mdspan)
add_subdirectory(${mdspan_SOURCE_DIR} ${mdspan_BINARY_DIR} EXCLUDE_FROM_ALL)
endif()

# surfio_lib
set(SRC_PATH "${CMAKE_CURRENT_LIST_DIR}/surfio/src/lib")
Expand All @@ -23,7 +29,8 @@ target_sources(
target_include_directories(
surfio_lib
INTERFACE ${SRC_PATH}/include
PRIVATE $<BUILD_INTERFACE:${mdspan_SOURCE_DIR}/include/>
PRIVATE ../mio
)

target_link_libraries(surfio_lib PRIVATE mdspan)

2 changes: 1 addition & 1 deletion ThirdParty/openzgy
Submodule openzgy updated 1 files
+2 −1 CMakeLists.txt