From a2fe6bca05f9d70337d04c0feaf7709a1d6c574c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 26 Dec 2018 16:05:13 +0100 Subject: [PATCH] gtest: fix includedir in cmake config files --- pkgs/development/libraries/gtest/default.nix | 4 +++ .../gtest/fix-cmake-config-includedir.patch | 30 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 06fffc4f524..65904ba215a 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation rec { sha256 = "0270msj6n7mggh4xqqjp54kswbl7mkcc8px1p5dqdpmw5ngh9fzk"; }; + patches = [ + ./fix-cmake-config-includedir.patch + ]; + nativeBuildInputs = [ cmake ninja ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch b/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch new file mode 100644 index 00000000000..c05e3a9326a --- /dev/null +++ b/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch @@ -0,0 +1,30 @@ +--- a/googlemock/CMakeLists.txt ++++ b/googlemock/CMakeLists.txt +@@ -106,10 +106,10 @@ + if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") + target_include_directories(gmock SYSTEM INTERFACE + "$" +- "$/${CMAKE_INSTALL_INCLUDEDIR}>") ++ "$") + target_include_directories(gmock_main SYSTEM INTERFACE + "$" +- "$/${CMAKE_INSTALL_INCLUDEDIR}>") ++ "$") + endif() + + ######################################################################## +--- a/googletest/CMakeLists.txt ++++ b/googletest/CMakeLists.txt +@@ -126,10 +126,10 @@ + if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") + target_include_directories(gtest SYSTEM INTERFACE + "$" +- "$/${CMAKE_INSTALL_INCLUDEDIR}>") ++ "$") + target_include_directories(gtest_main SYSTEM INTERFACE + "$" +- "$/${CMAKE_INSTALL_INCLUDEDIR}>") ++ "$") + endif() + target_link_libraries(gtest_main PUBLIC gtest) +