From a3d84f8da638b610d2120e466e392434bc398ce1 Mon Sep 17 00:00:00 2001 From: Dimitris Papagiannis Date: Fri, 7 Jun 2024 16:11:33 +0200 Subject: [PATCH] Fix ROOT build paths --- deploy_dqmgui.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy_dqmgui.sh b/deploy_dqmgui.sh index 8ebccb4..4b6239a 100755 --- a/deploy_dqmgui.sh +++ b/deploy_dqmgui.sh @@ -537,7 +537,7 @@ compile_root() { fi mkdir -p $ROOT_TMP_BUILD_DIR cd $ROOT_TMP_BUILD_DIR - cmake -DCMAKE_INSTALL_PREFIX=$ROOT_INSTALLATION_DIR $ROOT_TMP_DIR -DPYTHON_EXECUTABLE="$(which python${PYTHON_VERSION})" -Dtesting=OFF -Dbuiltin_gtest=OFF -Dclad=OFF + cmake -DCMAKE_INSTALL_PREFIX=$ROOT_INSTALLATION_DIR $ROOT_TMP_DIR/root -DPYTHON_EXECUTABLE="$(which python${PYTHON_VERSION})" -Dtesting=OFF -Dbuiltin_gtest=OFF -Dclad=OFF cmake --build . --target install -j $(nproc) cd $INSTALLATION_DIR rm -rf $ROOT_TMP_DIR $ROOT_TMP_BUILD_DIR @@ -602,7 +602,7 @@ done ## Internal temporary paths ROOT_TMP_DIR="${TMP_BASE_PATH}/root/$(_sanitize_string $ROOT_GIT_TAG)" -ROOT_TMP_BUILD_DIR="${TMP_BASE_PATH}/$(_sanitize_string $ROOT_GIT_TAG)/root_build" +ROOT_TMP_BUILD_DIR="${TMP_BASE_PATH}/root_build/$(_sanitize_string $ROOT_GIT_TAG)" ROTOGLUP_TMP_DIR="${TMP_BASE_PATH}/rotoglup" CLASSLIB_TMP_DIR="${TMP_BASE_PATH}/classlib-3.1.3" DMWM_TMP_DIR="${TMP_BASE_PATH}/dmwm"