Experiment removing gsl_tests_config

This commit is contained in:
Dmitry Kobets 2021-11-30 12:31:19 -08:00
parent b23c7f5cc8
commit d02b9b664a
2 changed files with 22 additions and 27 deletions

View File

@ -15,7 +15,6 @@ endif()
pkg_search_module(GTestMain gtest_main) pkg_search_module(GTestMain gtest_main)
if (NOT GTestMain_FOUND) if (NOT GTestMain_FOUND)
message(INFO, "Manually building googletest")
# No pre-installed GTest is available, try to download it using Git. # No pre-installed GTest is available, try to download it using Git.
find_package(Git REQUIRED QUIET) find_package(Git REQUIRED QUIET)
@ -46,7 +45,6 @@ if (NOT GTestMain_FOUND)
${CMAKE_CURRENT_BINARY_DIR}/googletest-build ${CMAKE_CURRENT_BINARY_DIR}/googletest-build
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
) )
message(INFO, "Done: Manually building googletest")
endif() endif()
if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
@ -60,11 +58,30 @@ if (MSVC AND (GSL_CXX_STANDARD EQUAL 17))
set(GSL_CPLUSPLUS_OPT -Zc:__cplusplus -permissive-) set(GSL_CPLUSPLUS_OPT -Zc:__cplusplus -permissive-)
endif() endif()
add_executable(gsl_tests
algorithm_tests.cpp
assertion_tests.cpp
at_tests.cpp
byte_tests.cpp
notnull_tests.cpp
owner_tests.cpp
span_compatibility_tests.cpp
span_ext_tests.cpp
span_tests.cpp
strict_notnull_tests.cpp
string_span_tests.cpp
utils_tests.cpp
)
# for tests to find the gtest header
target_include_directories(gsl_tests SYSTEM INTERFACE
googletest/googletest/include
)
# this interface adds compile options to how the tests are run # this interface adds compile options to how the tests are run
# please try to keep entries ordered =) # please try to keep entries ordered =)
add_library(gsl_tests_config INTERFACE)
if(MSVC) # MSVC or simulating MSVC if(MSVC) # MSVC or simulating MSVC
target_compile_options(gsl_tests_config INTERFACE target_compile_options(gsl_tests PRIVATE
${GSL_CPLUSPLUS_OPT} ${GSL_CPLUSPLUS_OPT}
/EHsc /EHsc
/W4 /W4
@ -104,7 +121,7 @@ if(MSVC) # MSVC or simulating MSVC
> >
) )
else() else()
target_compile_options(gsl_tests_config INTERFACE target_compile_options(gsl_tests PRIVATE
-fno-strict-aliasing -fno-strict-aliasing
-Wall -Wall
-Wcast-align -Wcast-align
@ -164,29 +181,8 @@ else()
) )
endif(MSVC) endif(MSVC)
# for tests to find the gtest header
target_include_directories(gsl_tests_config SYSTEM INTERFACE
googletest/googletest/include
)
add_executable(gsl_tests
algorithm_tests.cpp
assertion_tests.cpp
at_tests.cpp
byte_tests.cpp
notnull_tests.cpp
owner_tests.cpp
span_compatibility_tests.cpp
span_ext_tests.cpp
span_tests.cpp
strict_notnull_tests.cpp
string_span_tests.cpp
utils_tests.cpp
)
target_link_libraries(gsl_tests target_link_libraries(gsl_tests
Microsoft.GSL::GSL Microsoft.GSL::GSL
gsl_tests_config
${GTestMain_LIBRARIES} ${GTestMain_LIBRARIES}
) )
add_test(gsl_tests gsl_tests) add_test(gsl_tests gsl_tests)

View File

@ -11,5 +11,4 @@ ExternalProject_Add(googletest
BUILD_COMMAND "" BUILD_COMMAND ""
INSTALL_COMMAND "" INSTALL_COMMAND ""
TEST_COMMAND "" TEST_COMMAND ""
CMAKE_ARGS -Wno-dev
) )