Commit 3654e5ed authored by Joseph Noir's avatar Joseph Noir

Use env instead of cmake arg

parent 7a6486e3
...@@ -70,7 +70,7 @@ pipeline { ...@@ -70,7 +70,7 @@ pipeline {
} }
stage ('GCC on Mac') { stage ('GCC on Mac') {
agent { label 'macOS && gcc' } agent { label 'macOS && gcc' }
steps { unixBuild('Debug', '-DCMAKE_CXX_COMPILER=g++') } steps { unixBuild('Debug') }
} }
stage ('FreeBSD') { stage ('FreeBSD') {
agent { label 'FreeBSD' } agent { label 'FreeBSD' }
...@@ -148,6 +148,7 @@ def unixBuild(buildType = 'Debug', ...@@ -148,6 +148,7 @@ def unixBuild(buildType = 'Debug',
generator = 'Unix Makefiles', generator = 'Unix Makefiles',
cleanBuild = true) { cleanBuild = true) {
echo "building on $NODE_NAME" echo "building on $NODE_NAME"
withEnv(["label_exp="+STAGE_NAME.toLowerCase()]) {
deleteDir() deleteDir()
unstash('caf-sources') unstash('caf-sources')
dir('caf-sources') { dir('caf-sources') {
...@@ -170,6 +171,7 @@ def unixBuild(buildType = 'Debug', ...@@ -170,6 +171,7 @@ def unixBuild(buildType = 'Debug',
workingDir: 'build', workingDir: 'build',
]) ])
} }
}
} }
def msBuild(buildType = 'Debug', def msBuild(buildType = 'Debug',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment