From 862cd7303e6de211eeb38b4c14db549b55aa5d663d292a27cd3e832162fbf7fb Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Fri, 7 Feb 2020 07:38:41 +0000 Subject: [PATCH] Accepting request 770783 from home:simotek:branches:devel:tools:building - Revert "use cmake generics in marcos.cmake" it breaks many cases in stagings. OBS-URL: https://build.opensuse.org/request/show/770783 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=396 --- cmake.changes | 6 ++++++ cmake.macros | 18 +++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/cmake.changes b/cmake.changes index 1a5ce8e..c1d0e32 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 7 02:11:06 UTC 2020 - Simon Lees + +- Revert "use cmake generics in marcos.cmake" it breaks many + cases in stagings. + ------------------------------------------------------------------- Wed Feb 5 12:50:16 UTC 2020 - Tomáš Chvátal diff --git a/cmake.macros b/cmake.macros index 81772e4..cb7d206 100644 --- a/cmake.macros +++ b/cmake.macros @@ -7,14 +7,6 @@ %__builder %__make %__sourcedir . -%cmake_builder_deps() %{expand:\ -%if "%__builder" == "%__make" \ -BuildRequires: make \ -%else \ -BuildRequires: ninja \ -%endif \ -} - %cmake \ find %__sourcedir -name CMakeLists.txt \\\ -exec sed -i -re '/^[[:blank:]]*[sS][eE][tT][[:blank:]]*\\\([[:blank:]]*(CMAKE_BUILD_TYPE|CMAKE_COLOR_MAKEFILE|CMAKE_INSTALL_PREFIX|CMAKE_VERBOSE_MAKEFILE).*\\\)/{s/^/#IGNORE /}' {} + \ @@ -49,7 +41,15 @@ BuildRequires: ninja \ -DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\ -DCMAKE_MODULES_INSTALL_DIR=%{_datadir}/cmake/Modules -%cmake_build %__cmake --build . --verbose %{?_smp_mflags} +%__builder_verbose \ +%if "%__builder" == "%__make" \ + %{?_make_output_sync} VERBOSE=1 \\\ +%else \ + -v \\\ +%endif \ +%{nil} + +%cmake_build %__builder \\%__builder_verbose %{?_smp_mflags} %make_jobs \ echo "Deprecated %%make_jobs macro used, please use %%cmake_build" \