rshen/c-capnproto
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GoogleTest 1.14.0 when C++14 compiler available (2/2)

Browse source
This commit is contained in:
Jonah Beckford 2023-09-25 18:31:58 -07:00
parent a76885dfac
commit d64f4d1c62
1 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

25
tests/CMakeLists.txt
View file

@ -11,20 +11,24 @@
# error C2338: Error in C++ Standard Library usage. # error C2338: Error in C++ Standard Library usage.
# [build] C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.35.32215\include\type_traits(1767): # [build] C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.35.32215\include\type_traits(1767):
# error C2275: '_Ty1': illegal use of this type as an expression # error C2275: '_Ty1': illegal use of this type as an expression
set(GIT_TAG)
if(MSVC) if(MSVC)
if(MSVC_VERSION LESS 1934) if(MSVC_VERSION LESS 1934)
message(STATUS "Tests skipped because MSVC 19.34+ (MSVC 2022) is needed for GoogleTest 1.14+") message(STATUS "Using GoogleTest 1.13 because MSVC 19.34+ (MSVC 2022) is needed for GoogleTest 1.14+")
return() set(GIT_TAG b796f7d44681514f58a683a3a71ff17c94edb0c1) # v1.13.0
endif() endif()
elseif(NOT "cxx_std_14" IN_LIST CMAKE_CXX_COMPILE_FEATURES) elseif(NOT "cxx_std_14" IN_LIST CMAKE_CXX_COMPILE_FEATURES)
message(STATUS "Tests skipped because C++14 is needed for GoogleTest 1.14+") message(STATUS "Using GoogleTest 1.13 because C++14 is needed for GoogleTest 1.14+")
return() set(GIT_TAG b796f7d44681514f58a683a3a71ff17c94edb0c1) # v1.13.0
endif()
if(NOT GIT_TAG)
set(GIT_TAG f8d7d77c06936315286eb55f8de22cd23c188571) # v1.14.0
endif() endif()
include(FetchContent) include(FetchContent)
FetchContent_Declare(googletest FetchContent_Declare(googletest
GIT_REPOSITORY https://github.com/google/googletest.git GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG f8d7d77c06936315286eb55f8de22cd23c188571 # v1.14.0 GIT_TAG ${GIT_TAG}
) )
FetchContent_MakeAvailable(googletest) FetchContent_MakeAvailable(googletest)
@ -32,4 +36,13 @@ add_executable(c-capnproto-testcases addressbook.capnp.c capn-stream-test.cpp ca
target_link_libraries(c-capnproto-testcases PRIVATE CapnC_Runtime GTest::gtest) target_link_libraries(c-capnproto-testcases PRIVATE CapnC_Runtime GTest::gtest)
include(GoogleTest) include(GoogleTest)
gtest_add_tests(TARGET c-capnproto-testcases) gtest_add_tests(TARGET c-capnproto-testcases TEST_LIST testCases)
if(WIN32)
# On Windows gtest.dll must be in PATH or in current directory.
foreach(testCase IN LISTS testCases)
set_property(TEST ${testCase} APPEND PROPERTY
ENVIRONMENT_MODIFICATION
PATH=path_list_prepend:${PROJECT_BINARY_DIR}/bin)
endforeach()
endif()