mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 23:46:13 -05:00
4c7e8c234d
* gnu/packages/benchmark.scm(benchmark): New variable. * gnu/packages/patches/benchmark-unbundle-googletest.patch: New file. * gnu/local.mk(dist_patch_DATA): Add it.
69 lines
3.4 KiB
Diff
69 lines
3.4 KiB
Diff
From 5eb306618196ea78b8c9390e22ea2edce20760fe Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?G=C3=A1bor=20Boskovits?= <boskovits@gmail.com>
|
|
Date: Fri, 14 Jun 2019 22:15:49 +0200
|
|
Subject: [PATCH] Remove googletest lookup from build system.
|
|
|
|
---
|
|
cmake/GoogleTest.cmake | 18 +++++++++---------
|
|
cmake/GoogleTest.cmake.in | 12 ++++++------
|
|
2 files changed, 15 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/cmake/GoogleTest.cmake b/cmake/GoogleTest.cmake
|
|
index fb7c6be..a6c473b 100644
|
|
--- a/cmake/GoogleTest.cmake
|
|
+++ b/cmake/GoogleTest.cmake
|
|
@@ -27,15 +27,15 @@ endif()
|
|
# settings on Windows
|
|
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
|
|
|
|
-include(${GOOGLETEST_PREFIX}/googletest-paths.cmake)
|
|
+#include(${GOOGLETEST_PREFIX}/googletest-paths.cmake)
|
|
|
|
# Add googletest directly to our build. This defines
|
|
# the gtest and gtest_main targets.
|
|
-add_subdirectory(${GOOGLETEST_SOURCE_DIR}
|
|
- ${GOOGLETEST_BINARY_DIR}
|
|
- EXCLUDE_FROM_ALL)
|
|
-
|
|
-set_target_properties(gtest PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:gtest,INTERFACE_INCLUDE_DIRECTORIES>)
|
|
-set_target_properties(gtest_main PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:gtest_main,INTERFACE_INCLUDE_DIRECTORIES>)
|
|
-set_target_properties(gmock PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:gmock,INTERFACE_INCLUDE_DIRECTORIES>)
|
|
-set_target_properties(gmock_main PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:gmock_main,INTERFACE_INCLUDE_DIRECTORIES>)
|
|
+#add_subdirectory(${GOOGLETEST_SOURCE_DIR}
|
|
+# ${GOOGLETEST_BINARY_DIR}
|
|
+# EXCLUDE_FROM_ALL)
|
|
+
|
|
+#set_target_properties(gtest PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:gtest,INTERFACE_INCLUDE_DIRECTORIES>)
|
|
+#set_target_properties(gtest_main PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:gtest_main,INTERFACE_INCLUDE_DIRECTORIES>)
|
|
+#set_target_properties(gmock PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:gmock,INTERFACE_INCLUDE_DIRECTORIES>)
|
|
+#set_target_properties(gmock_main PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:gmock_main,INTERFACE_INCLUDE_DIRECTORIES>)
|
|
diff --git a/cmake/GoogleTest.cmake.in b/cmake/GoogleTest.cmake.in
|
|
index 28818ee..13b0888 100644
|
|
--- a/cmake/GoogleTest.cmake.in
|
|
+++ b/cmake/GoogleTest.cmake.in
|
|
@@ -31,7 +31,7 @@ if(EXISTS "${GOOGLETEST_PATH}" AND IS_DIRECTORY "${GOOGLETEST_PATH}"
|
|
)
|
|
else()
|
|
if(NOT ALLOW_DOWNLOADING_GOOGLETEST)
|
|
- 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.")
|
|
+ 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.")
|
|
else()
|
|
message(WARNING "Did not find Google Test sources! Fetching from web...")
|
|
ExternalProject_Add(
|
|
@@ -51,8 +51,8 @@ else()
|
|
endif()
|
|
endif()
|
|
|
|
-ExternalProject_Get_Property(googletest SOURCE_DIR BINARY_DIR)
|
|
-file(WRITE googletest-paths.cmake
|
|
-"set(GOOGLETEST_SOURCE_DIR \"${SOURCE_DIR}\")
|
|
-set(GOOGLETEST_BINARY_DIR \"${BINARY_DIR}\")
|
|
-")
|
|
+#ExternalProject_Get_Property(googletest SOURCE_DIR BINARY_DIR)
|
|
+#file(WRITE googletest-paths.cmake
|
|
+#"set(GOOGLETEST_SOURCE_DIR \"${SOURCE_DIR}\")
|
|
+#set(GOOGLETEST_BINARY_DIR \"${BINARY_DIR}\")
|
|
+#")
|
|
--
|
|
2.22.0
|
|
|