[packages/gtest] - fix broken cmakefiles, rel 3
baggins
baggins at pld-linux.org
Mon Feb 14 22:05:47 CET 2022
commit a154caf35f55935a0afaaf765508fbd674de3faf
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Feb 14 22:05:22 2022 +0100
- fix broken cmakefiles, rel 3
cmake.patch | 30 ++++++++++++++++++++++++++++++
gtest.spec | 4 +++-
2 files changed, 33 insertions(+), 1 deletion(-)
---
diff --git a/gtest.spec b/gtest.spec
index 18bd355..4de5adb 100644
--- a/gtest.spec
+++ b/gtest.spec
@@ -7,12 +7,13 @@ Summary: Google C++ testing framework
Summary(pl.UTF-8): Szkielet testów w C++ stworzony przez Google
Name: gtest
Version: 1.11.0
-Release: 2
+Release: 3
License: BSD
Group: Development/Tools
#Source0Download: https://github.com/google/googletest/releases
Source0: https://github.com/google/googletest/archive/release-%{version}/%{name}-%{version}.tar.gz
# Source0-md5: e8a8df240b6938bb6384155d4c37d937
+Patch0: cmake.patch
URL: https://github.com/google/googletest
BuildRequires: cmake >= 2.8.8
BuildRequires: libstdc++-devel >= 6:4.7
@@ -148,6 +149,7 @@ Kod źródłowy szkieletu gmock do osadzania go w innych projektach.
%prep
%setup -q -n googletest-release-%{version}
+%patch0 -p1
grep -rl 'bin/env python' googlemock/scripts | xargs %{__sed} -i -e '1s,^#!.*python,#!%{__python},'
diff --git a/cmake.patch b/cmake.patch
new file mode 100644
index 0000000..fa6d6df
--- /dev/null
+++ b/cmake.patch
@@ -0,0 +1,30 @@
+--- googletest-release-1.11.0/googletest/CMakeLists.txt~ 2021-06-11 19:42:26.000000000 +0200
++++ googletest-release-1.11.0/googletest/CMakeLists.txt 2022-02-14 22:01:48.393482954 +0100
+@@ -138,10 +138,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)
+
+--- googletest-release-1.11.0/googlemock/CMakeLists.txt~ 2021-06-11 19:42:26.000000000 +0200
++++ googletest-release-1.11.0/googlemock/CMakeLists.txt 2022-02-14 22:02:08.163879047 +0100
+@@ -111,10 +111,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()
+
+ ########################################################################
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gtest.git/commitdiff/a154caf35f55935a0afaaf765508fbd674de3faf
More information about the pld-cvs-commit
mailing list