testing/cmake
SHA256
3
0
Fork 0
forked from pool/cmake
Code Pull Requests Activity

Accepting request 669487 from home:scarabeus_iv:branches:devel:tools:building

Browse Source 
- 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
This commit is contained in:
Simon Lees 2019-01-29 10:09:31 +00:00 committed by Git OBS Bridge
parent 93c45dd121
commit 015ccf822f
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Jan 29 09:57:18 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- 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 Tue Jan 15 01:57:19 UTC 2019 - seanlew@opensuse.org

6
cmake.macros
View File

@ -42,13 +42,17 @@
-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
%make_jobs \ %cmake_build \
%if "%__builder" == "%__make" \ %if "%__builder" == "%__make" \
%__make %{?_smp_mflags} VERBOSE=1 \ %__make %{?_smp_mflags} VERBOSE=1 \
%else \ %else \
ninja -v %{?_smp_mflags} \ ninja -v %{?_smp_mflags} \
%endif %endif
%make_jobs \
echo "Deprecated %%make_jobs macro used, please use %%cmake_build" \
%cmake_build
%cmake_install \ %cmake_install \
DESTDIR=%{buildroot} %__builder install -C %__builddir DESTDIR=%{buildroot} %__builder install -C %__builddir