gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gtest: 1.14.0 -> 1.15.2

Browse Source
This commit is contained in:
Alyssa Ross
2024-09-20 09:49:40 +02:00
parent 345bbd89a6
commit c52c06de3b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/gtest/default.nix
+2 -2
View File
@@ -23,7 +23,7 @@
stdenv.mkDerivation rec {
pname = "gtest";
version = "1.14.0";
version = "1.15.2";
outputs = [ "out" "dev" ];
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
owner = "google";
repo = "googletest";
rev = "v${version}";
hash = "sha256-t0RchAHTJbuI5YW4uyBPykTvcjy90JW9AOPNjIhwh6U=";
hash = "sha256-1OJ2SeSscRBNr7zZ/a8bJGIqAnhkg45re0j3DtPfcXM=";
};
patches = [
pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch
+4 -4
View File
@@ -1,8 +1,8 @@
diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
index 428bd9f8..04b84539 100644
index 99b2411f..33ec9636 100644
--- a/googlemock/CMakeLists.txt
+++ b/googlemock/CMakeLists.txt
@@ -104,10 +104,10 @@ endif()
@@ -105,10 +105,10 @@ endif()
string(REPLACE ";" "$<SEMICOLON>" dirs "${gmock_build_include_dirs}")
target_include_directories(gmock SYSTEM INTERFACE
"$<BUILD_INTERFACE:${dirs}>"
@@ -16,7 +16,7 @@ index 428bd9f8..04b84539 100644
########################################################################
#
diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt
index 51a67c91..fb09e978 100644
index dce6a7c9..f1da42ff 100644
--- a/googletest/CMakeLists.txt
+++ b/googletest/CMakeLists.txt
@@ -143,10 +143,10 @@ set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION})
@@ -29,6 +29,6 @@ index 51a67c91..fb09e978 100644
"$<BUILD_INTERFACE:${dirs}>"
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
if(CMAKE_SYSTEM_NAME MATCHES "QNX")
if(CMAKE_SYSTEM_NAME MATCHES "QNX" AND CMAKE_SYSTEM_VERSION VERSION_GREATER_EQUAL 7.1)
target_link_libraries(gtest PUBLIC regex)
endif()