gnu/packages/patches/rnp-unbundle-googletest.patch

   1 From 4b4697c8dd66bd2b1e4d6b831bbde46e27d62c46 Mon Sep 17 00:00:00 2001
   2 From: Justus Winter <teythoon@avior.uberspace.de>
   3 Date: Tue, 21 Jul 2020 16:10:12 +0200
   4 Subject: [PATCH 1/2] Unbundle googletest.
   5
   6 ---
   7  src/tests/CMakeLists.txt          | 2 +-
   8  src/tests/gtest-CMakeLists.txt.in | 6 +++---
   9  2 files changed, 4 insertions(+), 4 deletions(-)
  10
  11 diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
  12 index 0a841666..d3c4fbe6 100644
  13 --- a/src/tests/CMakeLists.txt
  14 +++ b/src/tests/CMakeLists.txt
  15 @@ -53,7 +53,7 @@ endif()
  16  # maintain compiler/linker settings on Windows
  17  set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
  18  # add to our build (provides gtest_main target)
  19 -add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/googletest-src
  20 +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/googletest-src
  21                   ${CMAKE_CURRENT_BINARY_DIR}/googletest-build
  22                   EXCLUDE_FROM_ALL)
  23
  24 diff --git a/src/tests/gtest-CMakeLists.txt.in b/src/tests/gtest-CMakeLists.txt.in
  25 index a43e8e5d..3cc0ddd5 100644
  26 --- a/src/tests/gtest-CMakeLists.txt.in
  27 +++ b/src/tests/gtest-CMakeLists.txt.in
  28 @@ -4,9 +4,9 @@ project(googletest-download NONE)
  29
  30  include(ExternalProject)
  31  ExternalProject_Add(googletest
  32 -  GIT_REPOSITORY    https://github.com/google/googletest.git
  33 -  GIT_TAG           c43f710
  34 -  SOURCE_DIR        "${CMAKE_CURRENT_BINARY_DIR}/googletest-src"
  35 +#  GIT_REPOSITORY    https://github.com/google/googletest.git
  36 +#  GIT_TAG           c43f710
  37 +  SOURCE_DIR        "${CMAKE_CURRENT_SOURCE_DIR}/googletest-src"
  38    BINARY_DIR        "${CMAKE_CURRENT_BINARY_DIR}/googletest-build"
  39    CONFIGURE_COMMAND ""
  40    BUILD_COMMAND     ""
  41 --
  42 2.20.1
  43