From 13b085be7c87125b3c302a2a11459f2ddd2bd23d Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Oct 2023 17:11:08 +0200 Subject: [PATCH] build-style/cmake.sh: specify paths as type PATH specifying the type prevents cmake to converthing the paths relative to the CWD cmake documentation: Furthermore, if the is PATH or FILEPATH and the provided on the command line is a relative path, then the set command will treat the path as relative to the current working directory and convert it to an absolute path. --- common/build-style/cmake.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh index 36331635ddd..5760f73dbc8 100644 --- a/common/build-style/cmake.sh +++ b/common/build-style/cmake.sh @@ -52,10 +52,10 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) _EOF cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${build_wrksrc}/${cmake_builddir}/cross_${XBPS_CROSS_TRIPLET}.cmake" fi - cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr" + cmake_args+=" -DCMAKE_INSTALL_PREFIX:PATH=/usr" cmake_args+=" -DCMAKE_BUILD_TYPE=None" - cmake_args+=" -DCMAKE_INSTALL_LIBDIR=lib${XBPS_TARGET_WORDSIZE}" - cmake_args+=" -DCMAKE_INSTALL_SYSCONFDIR=/etc" + cmake_args+=" -DCMAKE_INSTALL_LIBDIR:PATH=lib${XBPS_TARGET_WORDSIZE}" + cmake_args+=" -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc" if [ "$CROSS_BUILD" ]; then cmake_args+=" -DQT_HOST_PATH=/usr" @@ -69,7 +69,7 @@ _EOF >> cross_${XBPS_CROSS_TRIPLET}.cmake fi - cmake_args+=" -DCMAKE_INSTALL_SBINDIR=bin" + cmake_args+=" -DCMAKE_INSTALL_SBINDIR:PATH=bin" export CMAKE_GENERATOR="${CMAKE_GENERATOR:-Ninja}" # Remove -pipe: https://gitlab.kitware.com/cmake/cmake/issues/19590