From be4bd35dfbaaecddcc71a2af30d637de863effb4 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 24 Apr 2024 06:55:27 +0200
Subject: [PATCH] CI Boost -> prefix path
---
.gitlab-ci.yml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c1bf16a798e..8d26ff000a1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -106,8 +106,6 @@ windows:
- . ./devtools/deploy/windows/setx64vcvars.ps1
- $OPT_DIR = "C:/opt/x64"
- $BOOST_DIR = "$OPT_DIR/boost_current"
- - $BOOST_INCLUDE_DIR = "$BOOST_DIR/include"
- - $BOOST_LIB_DIR = "$BOOST_DIR/lib"
- $QT_MSVC_DIR = "C:/Qt/6.2.4/msvc2019_64"
- $QTCMake_DIR = "$QT_MSVC_DIR/lib/cmake"
- $PY_PLATFORM_DIR = "C:/Users/admin/.pyenv/pyenv-win/versions/3.11.5/"
@@ -129,7 +127,7 @@ windows:
- pwd
# configure, make, test, pack
- cmake --version
- - cmake -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$OPT_DIR;$QTCMake_DIR" -DCMAKE_INCLUDE_PATH="$BOOST_INCLUDE_DIR" -DCMAKE_LIBRARY_PATH="$BOOST_LIB_DIR" -DPython3_ROOT_DIR="$PY_PLATFORM_DIR" -DCPACK_IFW_ROOT="C:/Qt/Tools/QtInstallerFramework/4.5" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER_LAUNCHER="buildcache.exe" -DCMAKE_CXX_COMPILER_LAUNCHER="buildcache.exe" -B. ..
+ - cmake -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$OPT_DIR;$QTCMake_DIR;$BOOST_DIR" -DPython3_ROOT_DIR="$PY_PLATFORM_DIR" -DCPACK_IFW_ROOT="C:/Qt/Tools/QtInstallerFramework/4.5" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER_LAUNCHER="buildcache.exe" -DCMAKE_CXX_COMPILER_LAUNCHER="buildcache.exe" -B. ..
- pwd
- if($CI_PIPELINE_SOURCE -eq "schedule") { cmake --build . --target clean; echo "redundant target purge done" }
- cmake --build . -j20 --config Release
--
GitLab