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

Accepting request 770783 from home:simotek:branches:devel:tools:building

Browse Source 
- Revert "use cmake generics in marcos.cmake" it breaks many
  cases in stagings.

OBS-URL: https://build.opensuse.org/request/show/770783
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=396
This commit is contained in:
Simon Lees 2020-02-07 07:38:41 +00:00 committed by Git OBS Bridge
parent d6ee93d6ec
commit 862cd7303e
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Feb 7 02:11:06 UTC 2020 - Simon Lees <sflees@suse.de>
- Revert "use cmake generics in marcos.cmake" it breaks many
cases in stagings.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 5 12:50:16 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com> Wed Feb 5 12:50:16 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>

18
cmake.macros
View File

@ -7,14 +7,6 @@
%__builder %__make %__builder %__make
%__sourcedir . %__sourcedir .
%cmake_builder_deps() %{expand:\
%if "%__builder" == "%__make" \
BuildRequires: make \
%else \
BuildRequires: ninja \
%endif \
}
%cmake \ %cmake \
find %__sourcedir -name CMakeLists.txt \\\ find %__sourcedir -name CMakeLists.txt \\\
-exec sed -i -re '/^[[:blank:]]*[sS][eE][tT][[:blank:]]*\\\([[:blank:]]*(CMAKE_BUILD_TYPE|CMAKE_COLOR_MAKEFILE|CMAKE_INSTALL_PREFIX|CMAKE_VERBOSE_MAKEFILE).*\\\)/{s/^/#IGNORE /}' {} + \ -exec sed -i -re '/^[[:blank:]]*[sS][eE][tT][[:blank:]]*\\\([[:blank:]]*(CMAKE_BUILD_TYPE|CMAKE_COLOR_MAKEFILE|CMAKE_INSTALL_PREFIX|CMAKE_VERBOSE_MAKEFILE).*\\\)/{s/^/#IGNORE /}' {} + \
@ -49,7 +41,15 @@ BuildRequires: ninja \
-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 %__cmake --build . --verbose %{?_smp_mflags} %__builder_verbose \
%if "%__builder" == "%__make" \
%{?_make_output_sync} VERBOSE=1 \\\
%else \
-v \\\
%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" \