[packages/gtest] - updated to 1.14.0

qboosh qboosh at pld-linux.org
Sat Dec 16 21:19:39 CET 2023


commit dc2ed1e0972c6ffc700a9700e58ac39fbd5aaa06
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Dec 16 21:08:11 2023 +0100

    - updated to 1.14.0

 cmake.patch | 50 +++++++++++++++++++++++++-------------------------
 gtest.spec  | 19 +++++++------------
 2 files changed, 32 insertions(+), 37 deletions(-)
---
diff --git a/gtest.spec b/gtest.spec
index 06a1153..ccb1e26 100644
--- a/gtest.spec
+++ b/gtest.spec
@@ -6,16 +6,16 @@
 Summary:	Google C++ testing framework
 Summary(pl.UTF-8):	Szkielet testów w C++ stworzony przez Google
 Name:		gtest
-Version:	1.13.0
+Version:	1.14.0
 Release:	1
 License:	BSD
 Group:		Development/Tools
 #Source0Download: https://github.com/google/googletest/releases
 Source0:	https://github.com/google/googletest/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	95b29f0038ec84a611df951d74d99897
+# Source0-md5:	c8340a482851ef6a3fe618a082304cfc
 Patch0:		cmake.patch
 URL:		https://github.com/google/googletest
-BuildRequires:	cmake >= 3.5
+BuildRequires:	cmake >= 3.13
 BuildRequires:	libstdc++-devel >= 6:5
 BuildRequires:	python >= 2.3
 BuildRequires:	python-modules >= 2.3
@@ -155,19 +155,14 @@ Kod źródłowy szkieletu gmock do osadzania go w innych projektach.
 # Note: official build system is now Bazel - but it's extremely distro unfriendly.
 # Use unofficial, community maintained CMake suite.
 %if %{with static_libs}
-install -d build-static
-cd build-static
-%cmake .. \
+%cmake -B build-static \
 	-DBUILD_SHARED_LIBS=OFF
-%{__make}
-cd ..
+%{__make} -C build-static
 %endif
 
-install -d build
-cd build
-%cmake ..
+%cmake -B build
 
-%{__make}
+%{__make} -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/cmake.patch b/cmake.patch
index d9d0fe3..f108754 100644
--- a/cmake.patch
+++ b/cmake.patch
@@ -1,30 +1,30 @@
---- googletest-release-1.12.1/googletest/CMakeLists.txt.orig	2023-01-16 21:26:08.891283192 +0100
-+++ googletest-release-1.12.1/googletest/CMakeLists.txt	2023-01-16 21:27:14.834259281 +0100
-@@ -134,10 +134,10 @@ if (DEFINED CMAKE_VERSION AND NOT "${CMA
-   string(REPLACE ";" "$<SEMICOLON>" dirs "${gtest_build_include_dirs}")
-   target_include_directories(gtest SYSTEM INTERFACE
-     "$<BUILD_INTERFACE:${dirs}>"
--    "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
-+    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
-   target_include_directories(gtest_main SYSTEM INTERFACE
-     "$<BUILD_INTERFACE:${dirs}>"
--    "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
-+    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
- endif()
+--- googletest-1.14.0/googletest/CMakeLists.txt.orig	2023-12-16 20:46:54.618198769 +0100
++++ googletest-1.14.0/googletest/CMakeLists.txt	2023-12-16 20:48:29.031020624 +0100
+@@ -143,10 +143,10 @@ set_target_properties(gtest_main PROPERT
+ string(REPLACE ";" "$<SEMICOLON>" dirs "${gtest_build_include_dirs}")
+ target_include_directories(gtest SYSTEM INTERFACE
+   "$<BUILD_INTERFACE:${dirs}>"
+-  "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
++  "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
+ target_include_directories(gtest_main SYSTEM INTERFACE
+   "$<BUILD_INTERFACE:${dirs}>"
+-  "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
++  "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
  if(CMAKE_SYSTEM_NAME MATCHES "QNX")
    target_link_libraries(gtest PUBLIC regex)
---- googletest-release-1.12.1/googlemock/CMakeLists.txt.orig	2023-01-16 21:26:08.891283192 +0100
-+++ googletest-release-1.12.1/googlemock/CMakeLists.txt	2023-01-16 21:27:34.230820868 +0100
-@@ -108,10 +108,10 @@ if (DEFINED CMAKE_VERSION AND NOT "${CMA
-   string(REPLACE ";" "$<SEMICOLON>" dirs "${gmock_build_include_dirs}")
-   target_include_directories(gmock SYSTEM INTERFACE
-     "$<BUILD_INTERFACE:${dirs}>"
--    "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
-+    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
-   target_include_directories(gmock_main SYSTEM INTERFACE
-     "$<BUILD_INTERFACE:${dirs}>"
--    "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
-+    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
  endif()
+--- googletest-1.14.0/googlemock/CMakeLists.txt.orig	2023-12-16 20:46:54.621532084 +0100
++++ googletest-1.14.0/googlemock/CMakeLists.txt	2023-12-16 20:49:09.650800568 +0100
+@@ -104,10 +104,10 @@ endif()
+ string(REPLACE ";" "$<SEMICOLON>" dirs "${gmock_build_include_dirs}")
+ target_include_directories(gmock SYSTEM INTERFACE
+   "$<BUILD_INTERFACE:${dirs}>"
+-  "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
++  "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
+ target_include_directories(gmock_main SYSTEM INTERFACE
+   "$<BUILD_INTERFACE:${dirs}>"
+-  "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
++  "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
  
  ########################################################################
+ #
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gtest.git/commitdiff/dc2ed1e0972c6ffc700a9700e58ac39fbd5aaa06



More information about the pld-cvs-commit mailing list