forked from pool/cmake
Accepting request 685029 from devel:tools:building
OBS-URL: https://build.opensuse.org/request/show/685029 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cmake?expand=0&rev=159
This commit is contained in:
commit
3c7765760c
@ -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>
|
Mon Feb 25 13:53:26 UTC 2019 - Dan Čermák <dcermak@suse.com>
|
||||||
|
|
||||||
|
11
cmake.macros
11
cmake.macros
@ -42,12 +42,15 @@
|
|||||||
-DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\
|
-DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\
|
||||||
-DCMAKE_MODULES_INSTALL_DIR=%{_datadir}/cmake/Modules
|
-DCMAKE_MODULES_INSTALL_DIR=%{_datadir}/cmake/Modules
|
||||||
|
|
||||||
%cmake_build \
|
%__builder_verbose \
|
||||||
%if "%__builder" == "%__make" \
|
%if "%__builder" == "%__make" \
|
||||||
%__make %{?_smp_mflags} VERBOSE=1 \
|
%{?_make_output_sync} VERBOSE=1 \\\
|
||||||
%else \
|
%else \
|
||||||
ninja -v %{?_smp_mflags} \
|
-v \\\
|
||||||
%endif
|
%endif \
|
||||||
|
%{nil}
|
||||||
|
|
||||||
|
%cmake_build %__builder \\%__builder_verbose %{?_smp_mflags}
|
||||||
|
|
||||||
%make_jobs \
|
%make_jobs \
|
||||||
echo "Deprecated %%make_jobs macro used, please use %%cmake_build" \
|
echo "Deprecated %%make_jobs macro used, please use %%cmake_build" \
|
||||||
|
Loading…
Reference in New Issue
Block a user