From 9a2e27e36f998ca7a45ffdc85fe5348db229287ef25a97848255a9980a8ad271 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 8 Mar 2016 07:29:07 +0000 Subject: [PATCH] Accepting request 367854 from home:scarabeus_iv:branches:devel:tools:building - Update macros to allow redefinition of builddir not to be build (found 1 upstream that already has build with actually some distributed files) OBS-URL: https://build.opensuse.org/request/show/367854 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=241 --- cmake.changes | 7 +++++++ cmake.macros | 9 +++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/cmake.changes b/cmake.changes index bed8da2..9ecfdf4 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 7 21:09:56 UTC 2016 - tchvatal@suse.com + +- Update macros to allow redefinition of builddir not to be build + (found 1 upstream that already has build with actually some + distributed files) + ------------------------------------------------------------------- Thu Feb 18 09:00:40 UTC 2016 - olaf@aepfle.de diff --git a/cmake.macros b/cmake.macros index 416c379..97f7cbc 100644 --- a/cmake.macros +++ b/cmake.macros @@ -3,12 +3,13 @@ # %__cmake %{_bindir}/cmake %__ctest %{_bindir}/ctest +%__builddir build %cmake \ find . -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 /}' {} + \ - mkdir -p build \ - cd build \ + mkdir -p %__builddir \ + cd %__builddir \ %__cmake .. \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\ -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\ @@ -38,9 +39,9 @@ %__make %{?_smp_mflags} VERBOSE=1 %cmake_install \ - %__make VERBOSE=1 DESTDIR=%{buildroot} install/fast -C build + %__make VERBOSE=1 DESTDIR=%{buildroot} install/fast -C %__builddir %ctest \ - cd build \ + cd %__builddir \ %__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} \ cd ..