diff --git a/cmake.changes b/cmake.changes index 9228d2f..bfad22e 100644 --- a/cmake.changes +++ b/cmake.changes @@ -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 diff --git a/cmake.macros b/cmake.macros index 3b63a62..138b7cc 100644 --- a/cmake.macros +++ b/cmake.macros @@ -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 \