Skip to content
Snippets Groups Projects
Commit b170da9f authored by Lars Bilke's avatar Lars Bilke
Browse files

[Jenkins] Use new conan gui option.

parent 3594a96c
No related branches found
No related tags found
No related merge requests found
#!/usr/bin/env groovy
@Library('jenkins-pipeline@1.0.4') _
@Library('jenkins-pipeline@1.0.5') _
def builders = [:]
def helper = new ogs.helper()
......
......@@ -41,6 +41,7 @@ image.inside(defaultDockerArgs) {
stage('Data Explorer (Linux-Docker)') {
configure.linux(
cmakeOptions: defaultCMakeOptions + guiCMakeOptions,
conanOptions: "-o gui=True",
keepDir: true,
script: this,
useConan: true
......
......@@ -33,6 +33,7 @@ withEnv(helper.getEnv(this)) {
stage('Data Explorer (Win)') {
configure.win(
cmakeOptions: defaultCMakeOptions + ' ' + guiCMakeOptions, keepDir: true,
conanOptions: "-o gui=True",
script: this
)
build.win(script: this)
......
......@@ -22,6 +22,7 @@ withEnv(helper.getEnv(this, 'x32')) {
configure.win(
arch: 'x86',
cmakeOptions: defaultCMakeOptions + guiCMakeOptions,
conanOptions: "-o gui=True",
script: this
)
build.win(script: this)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment