Merge pull request #5794 from moneroexamples/master

chfast · web-flow · commit b120a12c6cc5 · 2019-10-28T08:43:54.000+01:00
Upgrade GTest to 1.8.1
diff --git a/cmake/Hunter/config.cmake b/cmake/Hunter/config.cmake
@@ -25,3 +25,11 @@ hunter_config(
     URL https://github.com/chfast/intx/archive/v0.4.0.tar.gz
     SHA1 8a2a0b0efa64899db972166a9b3568a6984c61bc
 )
+
+hunter_config(
+    GTest
+    VERSION 1.8.1
+    URL https://github.com/google/googletest/archive/release-1.8.1.tar.gz
+    SHA1 152b849610d91a9dfa1401293f43230c2e0c33f8
+    CMAKE_ARGS BUILD_GMOCK=OFF gtest_force_shared_crt=ON
+)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -42,7 +42,7 @@ add_executable(aleth-unittests ${unittest_sources})
 target_include_directories(aleth-unittests PRIVATE ${UTILS_INCLUDE_DIR})
 target_link_libraries(aleth-unittests PRIVATE
     web3jsonrpc ethashseal devcrypto devcore
-    GTest::gtest GTest::main
+    GTest::gtest GTest::gtest_main
 )
 gtest_add_tests(TARGET aleth-unittests TEST_PREFIX unittests/ TEST_LIST unittests)
 set_tests_properties(${unittests} PROPERTIES TIMEOUT ${timeout})

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ add_executable(aleth-unittests ${unittest_sources})`
`42`	`42`	`target_include_directories(aleth-unittests PRIVATE ${UTILS_INCLUDE_DIR})`
`43`	`43`	`target_link_libraries(aleth-unittests PRIVATE`
`44`	`44`	`web3jsonrpc ethashseal devcrypto devcore`
`45`		`- GTest::gtest GTest::main`
	`45`	`+ GTest::gtest GTest::gtest_main`
`46`	`46`	`)`
`47`	`47`	`gtest_add_tests(TARGET aleth-unittests TEST_PREFIX unittests/ TEST_LIST unittests)`
`48`	`48`	`set_tests_properties(${unittests} PROPERTIES TIMEOUT ${timeout})`