From 446425847dec044ee88f5638f62afc7442ff318c Mon Sep 17 00:00:00 2001 From: John Date: Fri, 29 Jan 2021 16:47:02 +0100 Subject: [PATCH] build-style/cmake: replace sed monstrosity with ${wrksrc}/${build_wrksrc} --- common/build-style/cmake.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh index 5e4f2dadc8..26d55f527e 100644 --- a/common/build-style/cmake.sh +++ b/common/build-style/cmake.sh @@ -65,8 +65,7 @@ _EOF export CMAKE_GENERATOR="${CMAKE_GENERATOR:-Ninja}" # Override flags: https://gitlab.kitware.com/cmake/cmake/issues/19590 CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \ - cmake ${cmake_args} ${configure_args} $(echo ${cmake_builddir}|sed \ - -e 's|[^/]$|/|' -e 's|[^/]*||g' -e 's|/|../|g') + cmake ${cmake_args} ${configure_args} ${wrksrc}/${build_wrksrc} # Replace -isystem with -I for Qt4 and Qt5 packages find -name flags.make -exec sed -i "{}" -e"s;-isystem;-I;g" \;