From d3a7134199ab21b313218029c57d59b479405b30 Mon Sep 17 00:00:00 2001 From: Uwe Jakobeit Date: Mon, 30 Mar 2026 13:03:47 +0200 Subject: [PATCH] Jenkinsfile - set 'Qt6 installation dir'... still --- .gitignore | 2 ++ Jenkinsfile | 10 ++++++---- localbuild.sh | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 35595cc..9c66bd0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ CMakeFiles/ *.zip *.user app/.qtcreator/CMakeLists.txt.user +*.*swp + diff --git a/Jenkinsfile b/Jenkinsfile index 7b58895..7bb0842 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,8 @@ pipeline { agent any // Or use 'dockerfile' if running in a container + environment { + Qt6_DIR='/home/k4/Qt/6.10.2/gcc_64/lib/cmake/Qt6' + } stages { stage('Clean') { steps { @@ -16,15 +19,14 @@ pipeline { } } stage('Build') { - environment { - Qt6Dir=/home/k4/Qt/6.10.2/lib/cmake - } + steps { // Build the project using the generated files echo "Build project" // sh 'export Qt6Dir=/home/k4/Qt/6.10.2/lib/cmake' echo "See what's in the environment" - sh "env | grep Qt" + echo "Qt Dir is ${Qt6_DIR}" + // sh "env | grep Qt" sh 'cmake -S . -B build -DCMAKE_BUILD_TYPE=Release' // echo "See localbuild says on the environment" diff --git a/localbuild.sh b/localbuild.sh index aa2a3e6..3871f62 100755 --- a/localbuild.sh +++ b/localbuild.sh @@ -4,7 +4,8 @@ rm -r build # enable CMake to find Qt6 -Qt6Dir=$HOME/Qt/6.10.2/lib/cmake +export Qt6_DIR=$HOME/Qt/6.10.2/gcc_64/lib/cmake/Qt6 + # project configuration cmake -S . -B build -DCMAKE_BUILD_TYPE=Release #build executable