diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
| commit | 839bb4616f13171a23ad7937bf57d0a01d61d42a (patch) | |
| tree | 01de78a5ce973b9fb7ac0f9216d64f736f8e163d /gnu/packages/patches/rnp-unbundle-googletest.patch | |
| parent | 0357bbbcd850f9220078a62da3c30358b8983765 (diff) | |
| parent | ef71e3290916583973724316e815cee840c1b6d8 (diff) | |
| download | guix-839bb4616f13171a23ad7937bf57d0a01d61d42a.tar.gz | |
Merge remote-tracking branch 'origin/master' into staging.
With resolved conflicts in: gnu/packages/ibus.scm gnu/packages/image.scm gnu/packages/lisp.scm gnu/packages/virtualization.scm
Diffstat (limited to 'gnu/packages/patches/rnp-unbundle-googletest.patch')
| -rw-r--r-- | gnu/packages/patches/rnp-unbundle-googletest.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/gnu/packages/patches/rnp-unbundle-googletest.patch b/gnu/packages/patches/rnp-unbundle-googletest.patch deleted file mode 100644 index b85bfd1f0e..0000000000 --- a/gnu/packages/patches/rnp-unbundle-googletest.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 4b4697c8dd66bd2b1e4d6b831bbde46e27d62c46 Mon Sep 17 00:00:00 2001 -From: Justus Winter <teythoon@avior.uberspace.de> -Date: Tue, 21 Jul 2020 16:10:12 +0200 -Subject: [PATCH 1/2] Unbundle googletest. - ---- - src/tests/CMakeLists.txt | 2 +- - src/tests/gtest-CMakeLists.txt.in | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt -index 0a841666..d3c4fbe6 100644 ---- a/src/tests/CMakeLists.txt -+++ b/src/tests/CMakeLists.txt -@@ -53,7 +53,7 @@ endif() - # maintain compiler/linker settings on Windows - set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) - # add to our build (provides gtest_main target) --add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/googletest-src -+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/googletest-src - ${CMAKE_CURRENT_BINARY_DIR}/googletest-build - EXCLUDE_FROM_ALL) - -diff --git a/src/tests/gtest-CMakeLists.txt.in b/src/tests/gtest-CMakeLists.txt.in -index a43e8e5d..3cc0ddd5 100644 ---- a/src/tests/gtest-CMakeLists.txt.in -+++ b/src/tests/gtest-CMakeLists.txt.in -@@ -4,9 +4,9 @@ project(googletest-download NONE) - - include(ExternalProject) - ExternalProject_Add(googletest -- GIT_REPOSITORY https://github.com/google/googletest.git -- GIT_TAG c43f710 -- SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src" -+# GIT_REPOSITORY https://github.com/google/googletest.git -+# GIT_TAG c43f710 -+ SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/googletest-src" - BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-build" - CONFIGURE_COMMAND "" - BUILD_COMMAND "" --- -2.20.1 - |