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
|
Subject: Use Debian packaged GoogleTest
Author: Gregor Jasny <gjasny@googlemail.com>
Forwarded: not-needed
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,12 +82,12 @@
include(CheckAtomic)
if(ENABLE_TESTING)
- if(USE_THIRDPARTY_LIBRARIES)
+ #if(USE_THIRDPARTY_LIBRARIES)
find_package(googlemock-3rdparty CONFIG REQUIRED)
- else()
- find_package(GTest 1.8.1 CONFIG REQUIRED)
- endif()
- find_package(benchmark CONFIG)
+ #else()
+ # find_package(GTest 1.8.1 CONFIG REQUIRED)
+ #endif()
+ #find_package(benchmark CONFIG)
enable_testing()
endif()
--- a/cmake/googlemock-3rdparty-config.cmake
+++ b/cmake/googlemock-3rdparty-config.cmake
@@ -1,4 +1,4 @@
-get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_DIR}/../3rdparty/googletest/" ABSOLUTE)
+set(_IMPORT_PREFIX /usr/src/googletest)
find_package(Threads QUIET)
@@ -27,3 +27,7 @@
C_INCLUDE_WHAT_YOU_USE ""
CXX_INCLUDE_WHAT_YOU_USE ""
)
+target_compile_features(gmock_main
+ PUBLIC
+ cxx_std_17
+)
|