diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-12-26 16:05:13 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-12-26 19:00:49 +0100 |
| commit | a2fe6bca05f9d70337d04c0feaf7709a1d6c574c (patch) | |
| tree | 6693758d418fc7edfde354ffd85c713baeb7e896 /pkgs/development/libraries/gtest | |
| parent | bc8f67e37f67f93569c6f4dcbd6aa1dadd01f9cb (diff) | |
| download | nixlib-a2fe6bca05f9d70337d04c0feaf7709a1d6c574c.tar nixlib-a2fe6bca05f9d70337d04c0feaf7709a1d6c574c.tar.gz nixlib-a2fe6bca05f9d70337d04c0feaf7709a1d6c574c.tar.bz2 nixlib-a2fe6bca05f9d70337d04c0feaf7709a1d6c574c.tar.lz nixlib-a2fe6bca05f9d70337d04c0feaf7709a1d6c574c.tar.xz nixlib-a2fe6bca05f9d70337d04c0feaf7709a1d6c574c.tar.zst nixlib-a2fe6bca05f9d70337d04c0feaf7709a1d6c574c.zip | |
gtest: fix includedir in cmake config files
Diffstat (limited to 'pkgs/development/libraries/gtest')
| -rw-r--r-- | pkgs/development/libraries/gtest/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch | 30 |
2 files changed, 34 insertions, 0 deletions
diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 06fffc4f5240..65904ba215ad 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 000000000000..c05e3a9326ae --- /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 + "$<BUILD_INTERFACE:${gmock_build_include_dirs}>" +- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") ++ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>") + target_include_directories(gmock_main SYSTEM INTERFACE + "$<BUILD_INTERFACE:${gmock_build_include_dirs}>" +- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") ++ "$<INSTALL_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 + "$<BUILD_INTERFACE:${gtest_build_include_dirs}>" +- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") ++ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>") + target_include_directories(gtest_main SYSTEM INTERFACE + "$<BUILD_INTERFACE:${gtest_build_include_dirs}>" +- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") ++ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>") + endif() + target_link_libraries(gtest_main PUBLIC gtest) + |