Skip to content

Commit 7e61409

Browse files
committed
Updates GTest
1 parent b8b5fa2 commit 7e61409

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

tests/CMakeLists.txt

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ cmake_minimum_required(VERSION 3.0)
44
include("cmake/HunterGate.cmake")
55

66
HunterGate(
7-
URL "https://github.com/ruslo/hunter/archive/v0.23.28.tar.gz"
8-
SHA1 "6c79b36253a8e8bcba48927e9f3be65a3a81e6ec"
7+
URL "https://github.com/cpp-pm/hunter/archive/v0.23.262.tar.gz"
8+
SHA1 "eb51e633e08cdbe2153caf255e9c23968fecb29d"
99
)
1010

1111
project(HttpStatusCodesTests)
@@ -20,7 +20,7 @@ enable_testing()
2020
include_directories(${PROJECT_SOURCE_DIR}/..)
2121

2222
add_executable(CVariantTest CVariantTest.cpp)
23-
target_link_libraries(CVariantTest GTest::main)
23+
target_link_libraries(CVariantTest GTest::gtest_main)
2424
add_test(NAME CVariantTest COMMAND CVariantTest)
2525

2626
add_executable(CVariantCompileTest CVariantCompileTest.c)
@@ -32,7 +32,7 @@ set_target_properties(CVariantCompileTest PROPERTIES
3232
)
3333

3434
add_executable(C++VariantTest C++VariantTest.cpp)
35-
target_link_libraries(C++VariantTest GTest::main)
35+
target_link_libraries(C++VariantTest GTest::gtest_main)
3636
add_test(NAME C++VariantTest COMMAND C++VariantTest)
3737
set_target_properties(C++VariantTest PROPERTIES
3838
CXX_STANDARD 98
@@ -49,7 +49,7 @@ endif()
4949

5050
if(CXX_SUPPORTS_STRONG_ENUMS)
5151
add_executable(C++11VariantTest C++11VariantTest.cpp)
52-
target_link_libraries(C++11VariantTest GTest::main)
52+
target_link_libraries(C++11VariantTest GTest::gtest_main)
5353
add_test(NAME C++11VariantTest COMMAND C++11VariantTest)
5454
set_target_properties(C++11VariantTest PROPERTIES
5555
CXX_STANDARD 11
@@ -88,6 +88,9 @@ endif()
8888

8989
if (QTCORE_LIB)
9090
add_executable(QtVariantTest QtVariantTest.cpp "${PROJECT_SOURCE_DIR}/../HttpStatusCodes_Qt.h")
91-
target_link_libraries(QtVariantTest GTest::main ${QTCORE_LIB} ${QTNETWORK_LIB})
91+
target_link_libraries(QtVariantTest GTest::gtest_main ${QTCORE_LIB} ${QTNETWORK_LIB})
9292
add_test(NAME QtVariantTest COMMAND QtVariantTest)
93+
if (WIN32)
94+
set_tests_properties( QtVariantTest PROPERTIES ENVIRONMENT "PATH=$<TARGET_FILE_DIR:${QTCORE_LIB}>;$ENV{PATH}" )
95+
endif()
9396
endif()

0 commit comments

Comments
 (0)