From 015ccf822ff56c7b6e0660e3fcd950e8eb2a88fb030e14b7163324083b715908 Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Tue, 29 Jan 2019 10:09:31 +0000 Subject: [PATCH] Accepting request 669487 from home:scarabeus_iv:branches:devel:tools:building - Rename %make_jobs to %cmake_build to inline with other lang macros like meson, also since we are not just using make it is less confusing this way. Keep the %make_jobs as compat wrapper with warning for now OBS-URL: https://build.opensuse.org/request/show/669487 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=345 --- cmake.changes | 8 ++++++++ cmake.macros | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/cmake.changes b/cmake.changes index efd9584..f0fe9ca 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jan 29 09:57:18 UTC 2019 - Tomáš Chvátal + +- Rename %make_jobs to %cmake_build to inline with other lang macros + like meson, also since we are not just using make it is less + confusing this way. Keep the %make_jobs as compat wrapper with + warning for now + ------------------------------------------------------------------- Tue Jan 15 01:57:19 UTC 2019 - seanlew@opensuse.org diff --git a/cmake.macros b/cmake.macros index 681c8a6..7b1057e 100644 --- a/cmake.macros +++ b/cmake.macros @@ -42,13 +42,17 @@ -DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\ -DCMAKE_MODULES_INSTALL_DIR=%{_datadir}/cmake/Modules -%make_jobs \ +%cmake_build \ %if "%__builder" == "%__make" \ %__make %{?_smp_mflags} VERBOSE=1 \ %else \ ninja -v %{?_smp_mflags} \ %endif +%make_jobs \ + echo "Deprecated %%make_jobs macro used, please use %%cmake_build" \ + %cmake_build + %cmake_install \ DESTDIR=%{buildroot} %__builder install -C %__builddir