diff options
| author | Robert Scott <code@humanleg.org.uk> | 2022-07-13 12:41:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-13 12:41:31 +0100 |
| commit | 634c535aab13b050c4725e961599641ebef334ea (patch) | |
| tree | cf54c9aa246f57113e912a1a7f64269c1beafbd1 /pkgs/development/libraries | |
| parent | 1570838769fad637e3cf26a56ab6ff14d23c4b95 (diff) | |
| parent | 787d4b3a1cb4c1c0a7a10c10b93217240ee38035 (diff) | |
| download | nixpkgs-634c535aab13b050c4725e961599641ebef334ea.tar nixpkgs-634c535aab13b050c4725e961599641ebef334ea.tar.gz nixpkgs-634c535aab13b050c4725e961599641ebef334ea.tar.bz2 nixpkgs-634c535aab13b050c4725e961599641ebef334ea.tar.lz nixpkgs-634c535aab13b050c4725e961599641ebef334ea.tar.xz nixpkgs-634c535aab13b050c4725e961599641ebef334ea.tar.zst nixpkgs-634c535aab13b050c4725e961599641ebef334ea.zip | |
Merge pull request #179847 from tjhu/gtest
gtest: 1.11.0 -> 1.12.1
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/gtest/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch | 24 |
2 files changed, 16 insertions, 12 deletions
diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 59bfb449278..049d202a71e 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "gtest"; - version = "1.11.0"; + version = "1.12.1"; outputs = [ "out" "dev" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "google"; repo = "googletest"; rev = "release-${version}"; - hash = "sha256-SjlJxushfry13RGA7BCjYC9oZqV4z6x8dOiHfl/wpF0="; + hash = "sha256-W+OxRTVtemt2esw4P7IyGWXOonUN5ZuscjvzqkYvZbM="; }; patches = [ diff --git a/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch b/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch index c05e3a9326a..573884fdcbc 100644 --- a/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch +++ b/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch @@ -1,30 +1,34 @@ +diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt +index 5c1f0daf..ed8aae58 100644 --- 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") +@@ -108,10 +108,10 @@ if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") + string(REPLACE ";" "$<SEMICOLON>" dirs "${gmock_build_include_dirs}") target_include_directories(gmock SYSTEM INTERFACE - "$<BUILD_INTERFACE:${gmock_build_include_dirs}>" + "$<BUILD_INTERFACE:${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}>" + "$<BUILD_INTERFACE:${dirs}>" - "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") + "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>") endif() ######################################################################## +diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt +index aa00a5f3..50434fed 100644 --- 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") +@@ -134,10 +134,10 @@ if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") + string(REPLACE ";" "$<SEMICOLON>" dirs "${gtest_build_include_dirs}") target_include_directories(gtest SYSTEM INTERFACE - "$<BUILD_INTERFACE:${gtest_build_include_dirs}>" + "$<BUILD_INTERFACE:${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}>" + "$<BUILD_INTERFACE:${dirs}>" - "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") + "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>") endif() - target_link_libraries(gtest_main PUBLIC gtest) - + if(CMAKE_SYSTEM_NAME MATCHES "QNX") + target_link_libraries(gtest PUBLIC regex) |