From 35032cfccfe1d3db226f8bc9f91ead6c5e75b330 Mon Sep 17 00:00:00 2001 From: jchzhou Date: Sat, 17 Sep 2022 18:55:39 +0800 Subject: [PATCH] fix unexpected behaviour change of cmake builddir macro --- cmake.spec | 5 ++++- macros.cmake | 4 +--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmake.spec b/cmake.spec index ecc8a13..9acf065 100644 --- a/cmake.spec +++ b/cmake.spec @@ -11,7 +11,7 @@ Name: cmake Version: 3.22.0 -Release: 3 +Release: 4 Summary: Cross-platform make system License: BSD and MIT and zlib URL: http://www.cmake.org @@ -235,6 +235,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %exclude %{_pkgdocdir}/Copyright.txt %changelog +* Sat Sep 17 2022 Jiacheng Zhou - 3.22.0-4 +- Fix unexpected behaviour change of cmake builddir macro + * Tue Jul 12 2022 Jiacheng Zhou - 3.22.0-3 - Add cmake_build, cmake_install and related macros without changing current behaviour diff --git a/macros.cmake b/macros.cmake index a6009ff..560a026 100644 --- a/macros.cmake +++ b/macros.cmake @@ -8,9 +8,7 @@ %__cmake /usr/bin/cmake %__ctest /usr/bin/ctest # keep in-source building for backward compatibility -%_vpath_builddir . -%_vpath_srcdir . -%__cmake_builddir %{_vpath_builddir} +%__cmake_builddir %{!?__cmake_in_source_build:.}%{?__cmake_in_source_build:.} # - Set default compile flags # - CMAKE_*_FLAGS_RELEASE are added *after* the *FLAGS environment variables -- Gitee