From 9cee3988ccb174cdc0fe4bffd5a809c3adda867c3cad870b6063333198c241dd Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 14 Mar 2019 14:07:22 +0000 Subject: [PATCH] Accepting request 684805 from home:simotek:branches:devel:tools:building - Allow %cmake_build to handle parameters OBS-URL: https://build.opensuse.org/request/show/684805 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=355 --- cmake.changes | 5 +++++ cmake.macros | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/cmake.changes b/cmake.changes index 27f1be9..2a796fe 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 14 00:52:40 UTC 2019 - Simon Lees + +- Allow %cmake_build to handle parameters + ------------------------------------------------------------------- Mon Feb 25 13:53:26 UTC 2019 - Dan Čermák diff --git a/cmake.macros b/cmake.macros index 0e1a7f7..33c3c2f 100644 --- a/cmake.macros +++ b/cmake.macros @@ -42,12 +42,15 @@ -DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\ -DCMAKE_MODULES_INSTALL_DIR=%{_datadir}/cmake/Modules -%cmake_build \ +%__builder_verbose \ %if "%__builder" == "%__make" \ - %__make %{?_smp_mflags} VERBOSE=1 \ + %{?_make_output_sync} VERBOSE=1 \\\ %else \ - ninja -v %{?_smp_mflags} \ -%endif + -v \\\ +%endif \ +%{nil} + +%cmake_build %__builder \\%__builder_verbose %{?_smp_mflags} %make_jobs \ echo "Deprecated %%make_jobs macro used, please use %%cmake_build" \