From 262fd084db691b092d1df3178adc357f2dcaef38 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Feb 01 2021 08:09:14 +0000 Subject: import cmake-3.18.2-9.el8 --- diff --git a/SOURCES/macros.cmake b/SOURCES/macros.cmake index ebfebee..b8a5182 100644 --- a/SOURCES/macros.cmake +++ b/SOURCES/macros.cmake @@ -6,6 +6,9 @@ %_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON %_cmake_version @@CMAKE_VERSION@@ %__cmake /usr/bin/cmake +%__ctest /usr/bin/ctest +%__cmake_in_source_build 1 +%__cmake_builddir %{!?__cmake_in_source_build:%{_vpath_builddir}}%{?__cmake_in_source_build:.} # - Set default compile flags # - CMAKE_*_FLAGS_RELEASE are added *after* the *FLAGS environment variables @@ -24,6 +27,8 @@ %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \ %endif \ %__cmake \\\ + %{!?__cmake_in_source_build:-S "%{_vpath_srcdir}"} \\\ + %{!?__cmake_in_source_build:-B "%{__cmake_builddir}"} \\\ -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ @@ -36,6 +41,21 @@ %if "%{?_lib}" == "lib64" \ %{?_cmake_lib_suffix64} \\\ %endif \ - %{?_cmake_shared_libs} + %{?_cmake_shared_libs} + +%cmake_build \ + %__cmake --build "%{__cmake_builddir}" %{?_smp_mflags} --verbose + +%cmake_install \ + DESTDIR="%{buildroot}" %__cmake --install "%{__cmake_builddir}" + +%ctest(:-:) \ + cd "%{__cmake_builddir}" \ + %__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} %{**} \ + cd - + %cmake@@CMAKE_MAJOR_VERSION@@ %cmake +%cmake@@CMAKE_MAJOR_VERSION@@_build %cmake_build +%cmake@@CMAKE_MAJOR_VERSION@@_install %cmake_install +%ctest@@CMAKE_MAJOR_VERSION@@(:-:) %ctest %{**} diff --git a/SPECS/cmake.spec b/SPECS/cmake.spec index a8ad866..bb0653c 100644 --- a/SPECS/cmake.spec +++ b/SPECS/cmake.spec @@ -61,7 +61,7 @@ %global minor_version 18 %global patch_version 2 -%global baserelease 8 +%global baserelease 9 # Set to RC version if building RC, else %%{nil} #global rcsuf rc3 @@ -504,6 +504,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Mon Jan 25 2021 Tom Stellard - 3.18.2-9 +- Sync macros from Fedora + * Wed Oct 28 2020 sguelton@redhat.com - 3.18.2-8 - External libarchive dependency