SHA256
3
0
forked from pool/cmake

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
This commit is contained in:
Martin Pluskal 2019-03-14 14:07:22 +00:00 committed by Git OBS Bridge
parent 9063369946
commit 9cee3988cc
2 changed files with 12 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Mar 14 00:52:40 UTC 2019 - Simon Lees <sflees@suse.de>
- Allow %cmake_build to handle parameters
-------------------------------------------------------------------
Mon Feb 25 13:53:26 UTC 2019 - Dan Čermák <dcermak@suse.com>

View File

@ -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" \