From d99909132d5b3aadce4033466700916cedf2c09a Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sat, 25 Jul 2020 17:50:33 +0200 Subject: [PATCH] Use new set of cmake macros --- gtest.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gtest.spec b/gtest.spec index b72cffb..d32d98c 100644 --- a/gtest.spec +++ b/gtest.spec @@ -1,7 +1,7 @@ Summary: Google C++ testing framework Name: gtest Version: 1.10.0 -Release: 1%{?dist} +Release: 2%{?dist} # scripts/generator/* are ASL 2.0 License: BSD and ASL 2.0 URL: https://github.com/google/googletest @@ -68,19 +68,16 @@ sed -e "s/set(GOOGLETEST_VERSION .*)/set(GOOGLETEST_VERSION %{version})/" -i CMa %build -mkdir build && cd build %cmake -DBUILD_SHARED_LIBS=ON \ -DPYTHON_EXECUTABLE=%{__python3} \ - -Dgtest_build_tests=ON .. -%make_build + -Dgtest_build_tests=ON +%cmake_build %install -cd build -%make_install +%cmake_install %check -cd build -make test +%ctest %files %license googletest/LICENSE @@ -113,6 +110,9 @@ make test %{_libdir}/pkgconfig/gmock_main.pc %changelog +* Sat Jul 25 2020 Terje Rosten - 1.10.0-2 +- Use new set of cmake macros + * Sat Mar 21 2020 Neal Gompa - 1.10.0-1 - Rebase to 1.10.0 (rhbz#1810432) - Remove upstreamed patches