From fbadbabca656e9f69fcb7e01a038ab0c1d5e9d6d Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Fri, 3 Jul 2020 22:36:43 +0200 Subject: [PATCH] Revert "Enable out-of-source builds" This reverts commit 419924585f347ee0d4c399fe2af3ca870ea65d85. Signed-off-by: Igor Raits --- cmake.spec | 5 +---- macros.cmake | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cmake.spec b/cmake.spec index a245511..5855640 100644 --- a/cmake.spec +++ b/cmake.spec @@ -67,7 +67,7 @@ Name: %{orig_name}%{?name_suffix} Version: %{major_version}.%{minor_version}.0 -Release: 0.8%{?relsuf}%{?dist} +Release: 0.7%{?relsuf}%{?dist} Summary: Cross-platform make system # most sources are BSD @@ -503,9 +503,6 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog -* Fri Jul 03 2020 Igor Raits - 3.18.0-0.8.rc2 -- Enable out-of-source builds - * Fri Jul 03 2020 Neal Gompa - 3.18.0-0.7.rc2 - Switch to implementation that is backwards compatible to older RPM - Change control macro for in-source/out-of-source to %%__cmake_in_source_build diff --git a/macros.cmake b/macros.cmake index 06bdeda..8440d93 100644 --- a/macros.cmake +++ b/macros.cmake @@ -7,6 +7,7 @@ %_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