Accepting request 430013 from home:boombatower:branches:devel:tools:building

Utilize $OLDPWD to make __sourcedir always relative to root regardless of the __builddir.

OBS-URL: https://build.opensuse.org/request/show/430013
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=269
This commit is contained in:
Martin Pluskal 2016-09-26 11:02:24 +00:00 committed by Git OBS Bridge
parent b4adfaa227
commit 43f23f4c82
2 changed files with 13 additions and 2 deletions

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sun Sep 25 00:21:58 UTC 2016 - jimmy@boombatower.com
- Utilize $OLDPWD to make __sourcedir always relative to root
regardless of the __builddir.
-------------------------------------------------------------------
Fri Sep 23 23:43:22 UTC 2016 - jimmy@boombatower.com
- Indeed, do prepend .. to sourcedir.
-------------------------------------------------------------------
Tue Sep 13 21:29:10 UTC 2016 - foss@grueninger.de

View File

@ -5,14 +5,14 @@
%__ctest %{_bindir}/ctest
%__builddir build
%__builder %__make
%__sourcedir ..
%__sourcedir .
%cmake \
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 %__sourcedir \\\
%__cmake $OLDPWD/%__sourcedir \\\
%if "%__builder" == "%__make" \
-G"Unix Makefiles" \\\
%else \