Skip to content

Commit

Permalink
Merge pull request #380 from nmm0/use-fetchcontent-googletest
Browse files Browse the repository at this point in the history
Use fetchcontent googletest
  • Loading branch information
nmm0 authored Mar 3, 2025
2 parents 74036ad + 03361cf commit 31a5c74
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 43 deletions.
16 changes: 0 additions & 16 deletions cmake/googletest/CMakeLists.txt.in

This file was deleted.

40 changes: 13 additions & 27 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function(mdspan_add_test name)
set_source_files_properties(${name} PROPERTIES LANGUAGE ${MDSPAN_TEST_LANGUAGE})
endif()
add_executable(${name} ${ARGUMENT_SOURCE})
target_link_libraries(${name} mdspan gtest_main)
target_link_libraries(${name} mdspan GTest::gtest_main)
add_test(${name} ${name})
set_property(TARGET ${name} PROPERTY COMPILE_WARNING_AS_ERROR ON)
target_compile_definitions(${name}
Expand All @@ -31,35 +31,21 @@ endfunction()

if(MDSPAN_USE_SYSTEM_GTEST)
find_package(GTest CONFIG REQUIRED)
add_library(gtest_main ALIAS GTest::gtest_main)
else()
# adapted from https://github.com/google/googletest/blob/master/googletest/README.md
configure_file(${PROJECT_SOURCE_DIR}/cmake/googletest/CMakeLists.txt.in googletest-download/CMakeLists.txt)
execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
RESULT_VARIABLE result
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download
)
if(result)
message(FATAL_ERROR "CMake step for googletest failed: ${result}")
endif()
execute_process(COMMAND ${CMAKE_COMMAND} --build .
RESULT_VARIABLE result
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download
)
if(result)
message(FATAL_ERROR "Build step for googletest failed: ${result}")
include(FetchContent)

if (MSVC)
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
endif()

# Prevent overriding the parent project's compiler/linker
# settings on Windows
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)

# Add googletest directly to our build. This defines
# the gtest and gtest_main targets.
add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/googletest-src
${CMAKE_CURRENT_BINARY_DIR}/googletest-build
EXCLUDE_FROM_ALL
fetchcontent_declare(
googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG v1.16.0
)

fetchcontent_makeavailable(googletest)

add_library(GTest::gtest_main ALIAS gtest_main)
endif()

# FIXME_MSVC
Expand Down

0 comments on commit 31a5c74

Please sign in to comment.