blob: 51f2a7b563ff6ab38411b0713028288c9293056a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 0a669d5..bc8bbdd 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -7,22 +7,7 @@ if(MSVC)
set(CMAKE_STATIC_LIBRARY_PREFIX "")
endif()
-ExternalProject_Add(
- googletest_project
- SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.8.0"
- INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/prefix"
- CMAKE_ARGS
- -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
- -DBUILD_GMOCK=ON
- -Dgtest_force_shared_crt=ON
-)
-
-add_library(gmock UNKNOWN IMPORTED)
-set_target_properties(gmock PROPERTIES
- IMPORTED_LOCATION
- ${PROJECT_BINARY_DIR}/test/prefix/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX}
-)
-
+find_package(GTest REQUIRED CONFIG)
find_package(Threads)
include_directories(SYSTEM "${PROJECT_BINARY_DIR}/test/prefix/include")
@@ -56,14 +41,12 @@ set_target_properties(run-tests PROPERTIES
CXX_STANDARD_REQUIRED ON
)
-add_dependencies(run-tests googletest_project)
-
set_target_properties(run-tests PROPERTIES
COMPILE_FLAGS "${yaml_c_flags} ${yaml_cxx_flags} ${yaml_test_flags}"
)
target_link_libraries(run-tests
yaml-cpp
- gmock
+ GTest::gmock
${CMAKE_THREAD_LIBS_INIT})
add_test(yaml-test ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/run-tests)
|
GitWeb
