git.iko.soy/typeable/nixpkgs
on master help sign in
gtest: fix includedir in cmake config files
commita2fe6bca05f9d70337d04c0feaf7709a1d6c574c authorJan Tojnar <jtojnar@gmail.com> dateWed 26 Dec 2018, 16:05 (8 years ago) parentbc8f67e
2 files changed+34
pkgs/development/libraries/gtest/default.nix+4 pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch+30
pkgs/development/libraries/gtest/default.nix+4
@@ -12,6 +12,10 @@ stdenv.mkDerivation rec {
1212 sha256 = "0270msj6n7mggh4xqqjp54kswbl7mkcc8px1p5dqdpmw5ngh9fzk";
1313 };
1414
15+ patches = [
16+ ./fix-cmake-config-includedir.patch
17+ ];
18+
1519 nativeBuildInputs = [ cmake ninja ];
1620
1721 cmakeFlags = [
pkgs/development/libraries/gtest/fix-cmake-config-includedir.patchnew file+30
@@ -0,0 +1,30 @@
1+--- a/googlemock/CMakeLists.txt
2++++ b/googlemock/CMakeLists.txt
3+@@ -106,10 +106,10 @@
4+ if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
5+ target_include_directories(gmock SYSTEM INTERFACE
6+ "$<BUILD_INTERFACE:${gmock_build_include_dirs}>"
7+- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
8++ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
9+ target_include_directories(gmock_main SYSTEM INTERFACE
10+ "$<BUILD_INTERFACE:${gmock_build_include_dirs}>"
11+- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
12++ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
13+ endif()
14+
15+ ########################################################################
16+--- a/googletest/CMakeLists.txt
17++++ b/googletest/CMakeLists.txt
18+@@ -126,10 +126,10 @@
19+ if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
20+ target_include_directories(gtest SYSTEM INTERFACE
21+ "$<BUILD_INTERFACE:${gtest_build_include_dirs}>"
22+- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
23++ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
24+ target_include_directories(gtest_main SYSTEM INTERFACE
25+ "$<BUILD_INTERFACE:${gtest_build_include_dirs}>"
26+- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
27++ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
28+ endif()
29+ target_link_libraries(gtest_main PUBLIC gtest)
30+