From 36f65f7882d2cfcf324ca74fc3326db920445d20a65709fb8cf0011968166c0d Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Sat, 10 Sep 2016 06:48:32 +0000 Subject: [PATCH] Accepting request 426207 from home:boombatower:graphics Update %cmake macro to provide %__sourcedir parameter. OBS-URL: https://build.opensuse.org/request/show/426207 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=264 --- cmake.changes | 5 +++++ cmake.macros | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cmake.changes b/cmake.changes index a14ab03..8e9474b 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 9 23:38:12 UTC 2016 - jimmy@boombatower.com + +- Update %cmake macro to provide %__sourcedir parameter. + ------------------------------------------------------------------- Fri Aug 26 08:27:17 UTC 2016 - tchvatal@suse.com diff --git a/cmake.macros b/cmake.macros index 79b0ecd..2a3a3c3 100644 --- a/cmake.macros +++ b/cmake.macros @@ -5,13 +5,14 @@ %__ctest %{_bindir}/ctest %__builddir build %__builder %__make +%__sourcedir . %cmake \ - find . -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 /}' {} + \ mkdir -p %__builddir \ cd %__builddir \ - %__cmake .. \\\ + %__cmake ../%__sourcedir \\\ %if "%__builder" == "%__make" \ -G"Unix Makefiles" \\\ %else \