Skip to content

Commit 75a2488

Browse files
committed
Reverts back to GTest 1.8.0 for older MSVC
1 parent a240a38 commit 75a2488

File tree

1 file changed

+20
-8
lines changed

1 file changed

+20
-8
lines changed

tests/CMakeLists.txt

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,22 @@ cmake_minimum_required(VERSION 3.0)
33
# Package Management using Hunter
44
include("cmake/HunterGate.cmake")
55

6-
HunterGate(
7-
URL "https://github.com/cpp-pm/hunter/archive/v0.23.224.tar.gz"
8-
SHA1 "18e57a43efc435f2e1dae1291e82e42afbf940be"
9-
)
6+
if ( WIN32 AND ( MSVC_TOOLSET_VERSION LESS 140 ) )
7+
# Visual Studio < 2015
8+
# GTest 1.8.0
9+
HunterGate(
10+
URL "https://github.com/cpp-pm/hunter/archive/v0.23.222.tar.gz"
11+
SHA1 "0b88baaa2a9a35b8ce632c57ade66be8dd918afd"
12+
)
13+
set( GTEST_MAIN GTest::main )
14+
else()
15+
# GTest 1.8.1
16+
HunterGate(
17+
URL "https://github.com/cpp-pm/hunter/archive/v0.23.224.tar.gz"
18+
SHA1 "18e57a43efc435f2e1dae1291e82e42afbf940be"
19+
)
20+
set( GTEST_MAIN GTest::gtest_main )
21+
endif()
1022

1123
project(HttpStatusCodesTests)
1224

@@ -20,7 +32,7 @@ enable_testing()
2032
include_directories(${PROJECT_SOURCE_DIR}/..)
2133

2234
add_executable(CVariantTest CVariantTest.cpp)
23-
target_link_libraries(CVariantTest GTest::gtest_main)
35+
target_link_libraries(CVariantTest ${GTEST_MAIN})
2436
add_test(NAME CVariantTest COMMAND CVariantTest)
2537

2638
add_executable(CVariantCompileTest CVariantCompileTest.c)
@@ -32,7 +44,7 @@ set_target_properties(CVariantCompileTest PROPERTIES
3244
)
3345

3446
add_executable(C++VariantTest C++VariantTest.cpp)
35-
target_link_libraries(C++VariantTest GTest::gtest_main)
47+
target_link_libraries(C++VariantTest ${GTEST_MAIN})
3648
add_test(NAME C++VariantTest COMMAND C++VariantTest)
3749
set_target_properties(C++VariantTest PROPERTIES
3850
CXX_STANDARD 98
@@ -49,7 +61,7 @@ endif()
4961

5062
if(CXX_SUPPORTS_STRONG_ENUMS)
5163
add_executable(C++11VariantTest C++11VariantTest.cpp)
52-
target_link_libraries(C++11VariantTest GTest::gtest_main)
64+
target_link_libraries(C++11VariantTest ${GTEST_MAIN})
5365
add_test(NAME C++11VariantTest COMMAND C++11VariantTest)
5466
set_target_properties(C++11VariantTest PROPERTIES
5567
CXX_STANDARD 11
@@ -88,7 +100,7 @@ endif()
88100

89101
if (QTCORE_LIB)
90102
add_executable(QtVariantTest QtVariantTest.cpp "${PROJECT_SOURCE_DIR}/../HttpStatusCodes_Qt.h")
91-
target_link_libraries(QtVariantTest GTest::gtest_main ${QTCORE_LIB} ${QTNETWORK_LIB})
103+
target_link_libraries(QtVariantTest ${GTEST_MAIN} ${QTCORE_LIB} ${QTNETWORK_LIB})
92104
add_test(NAME QtVariantTest COMMAND QtVariantTest)
93105
if (WIN32)
94106
set_tests_properties( QtVariantTest PROPERTIES ENVIRONMENT "PATH=$<TARGET_FILE_DIR:${QTCORE_LIB}>;$ENV{PATH}" )

0 commit comments

Comments
 (0)