Commit | Line | Data |
---|---|---|
4c7e8c23 GB |
1 | From 5eb306618196ea78b8c9390e22ea2edce20760fe Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?G=C3=A1bor=20Boskovits?= <boskovits@gmail.com> | |
3 | Date: Fri, 14 Jun 2019 22:15:49 +0200 | |
4 | Subject: [PATCH] Remove googletest lookup from build system. | |
5 | ||
6 | --- | |
7 | cmake/GoogleTest.cmake | 18 +++++++++--------- | |
8 | cmake/GoogleTest.cmake.in | 12 ++++++------ | |
9 | 2 files changed, 15 insertions(+), 15 deletions(-) | |
10 | ||
11 | diff --git a/cmake/GoogleTest.cmake b/cmake/GoogleTest.cmake | |
12 | index fb7c6be..a6c473b 100644 | |
13 | --- a/cmake/GoogleTest.cmake | |
14 | +++ b/cmake/GoogleTest.cmake | |
15 | @@ -27,15 +27,15 @@ endif() | |
16 | # settings on Windows | |
17 | set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) | |
18 | ||
19 | -include(${GOOGLETEST_PREFIX}/googletest-paths.cmake) | |
20 | +#include(${GOOGLETEST_PREFIX}/googletest-paths.cmake) | |
21 | ||
22 | # Add googletest directly to our build. This defines | |
23 | # the gtest and gtest_main targets. | |
24 | -add_subdirectory(${GOOGLETEST_SOURCE_DIR} | |
25 | - ${GOOGLETEST_BINARY_DIR} | |
26 | - EXCLUDE_FROM_ALL) | |
27 | - | |
28 | -set_target_properties(gtest PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:gtest,INTERFACE_INCLUDE_DIRECTORIES>) | |
29 | -set_target_properties(gtest_main PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:gtest_main,INTERFACE_INCLUDE_DIRECTORIES>) | |
30 | -set_target_properties(gmock PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:gmock,INTERFACE_INCLUDE_DIRECTORIES>) | |
31 | -set_target_properties(gmock_main PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:gmock_main,INTERFACE_INCLUDE_DIRECTORIES>) | |
32 | +#add_subdirectory(${GOOGLETEST_SOURCE_DIR} | |
33 | +# ${GOOGLETEST_BINARY_DIR} | |
34 | +# EXCLUDE_FROM_ALL) | |
35 | + | |
36 | +#set_target_properties(gtest PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:gtest,INTERFACE_INCLUDE_DIRECTORIES>) | |
37 | +#set_target_properties(gtest_main PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:gtest_main,INTERFACE_INCLUDE_DIRECTORIES>) | |
38 | +#set_target_properties(gmock PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:gmock,INTERFACE_INCLUDE_DIRECTORIES>) | |
39 | +#set_target_properties(gmock_main PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:gmock_main,INTERFACE_INCLUDE_DIRECTORIES>) | |
40 | diff --git a/cmake/GoogleTest.cmake.in b/cmake/GoogleTest.cmake.in | |
41 | index 28818ee..13b0888 100644 | |
42 | --- a/cmake/GoogleTest.cmake.in | |
43 | +++ b/cmake/GoogleTest.cmake.in | |
44 | @@ -31,7 +31,7 @@ if(EXISTS "${GOOGLETEST_PATH}" AND IS_DIRECTORY "${GOOGLETEST_PATH}" | |
45 | ) | |
46 | else() | |
47 | if(NOT ALLOW_DOWNLOADING_GOOGLETEST) | |
48 | - message(SEND_ERROR "Did not find Google Test sources! Either pass correct path in GOOGLETEST_PATH, or enable ALLOW_DOWNLOADING_GOOGLETEST, or disable BENCHMARK_ENABLE_GTEST_TESTS / BENCHMARK_ENABLE_TESTING.") | |
49 | + message(WARNING "Did not find Google Test sources! Either pass correct path in GOOGLETEST_PATH, or enable ALLOW_DOWNLOADING_GOOGLETEST, or disable BENCHMARK_ENABLE_GTEST_TESTS / BENCHMARK_ENABLE_TESTING.") | |
50 | else() | |
51 | message(WARNING "Did not find Google Test sources! Fetching from web...") | |
52 | ExternalProject_Add( | |
53 | @@ -51,8 +51,8 @@ else() | |
54 | endif() | |
55 | endif() | |
56 | ||
57 | -ExternalProject_Get_Property(googletest SOURCE_DIR BINARY_DIR) | |
58 | -file(WRITE googletest-paths.cmake | |
59 | -"set(GOOGLETEST_SOURCE_DIR \"${SOURCE_DIR}\") | |
60 | -set(GOOGLETEST_BINARY_DIR \"${BINARY_DIR}\") | |
61 | -") | |
62 | +#ExternalProject_Get_Property(googletest SOURCE_DIR BINARY_DIR) | |
63 | +#file(WRITE googletest-paths.cmake | |
64 | +#"set(GOOGLETEST_SOURCE_DIR \"${SOURCE_DIR}\") | |
65 | +#set(GOOGLETEST_BINARY_DIR \"${BINARY_DIR}\") | |
66 | +#") | |
67 | -- | |
68 | 2.22.0 | |
69 |