rpms/cmake
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add %cmake_build/%cmake_install/%ctest macros with support of out-of-source builds

Browse source 
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
This commit is contained in:
Igor Raits 2020-07-03 19:52:09 +02:00
commit d9ac0c8d8d
No known key found for this signature in database
GPG key ID: 115D5AB89C5C1E1E
2 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cmake.spec
View file

@ -67,7 +67,7 @@
Name: %{orig_name}%{?name_suffix}
Version: %{major_version}.%{minor_version}.3
Release: 1%{?relsuf}%{?dist}
Release: 2%{?relsuf}%{?dist}
Summary: Cross-platform make system
# most sources are BSD
@ -493,6 +493,10 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
%changelog
* Fri Jul 03 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 3.17.3-2
- Add %%cmake_build/%%cmake_install/%%ctest macros
- Add %%__cmake_in_source_build macro to control in-source/out-of-source builds
* Fri May 29 2020 Björn Esser <besser82@fedoraproject.org> - 3.17.3-1
- Update to cmake-3.17.3

22
macros.cmake
View file

@ -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 \\\
-S "%{_vpath_srcdir}" \\\
-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