diff --git a/Jenkinsfile b/Jenkinsfile index 9150da5bef..19ba20659e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -45,7 +45,7 @@ stage('Build') { node('windows') { timeout(time: 90, unit: 'MINUTES') { // We specify the workspace directory manually to reduce the path length and thus try to avoid MSB3491 on Visual Studio - ws("C:/J/O/${env.BRANCH_NAME}/${env.BUILD_ID}") { + ws("${env.JENKINS_BASE}/O/${env.BRANCH_NAME}/${env.BUILD_ID}") { deleteDir() checkout scm bat ''' @@ -79,7 +79,7 @@ stage('Build') { cd ${srcDir}/build /Applications/CMake.app/Contents/bin/cmake -G Xcode ${srcDir} .. ''' + flags + ''' - xcodebuild -quiet -parallelizeTargets -jobs 4 + xcodebuild -parallelizeTargets -jobs 4 -target OpenSpace ''' } } diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct index 575839eae2..a29d90e30c 160000 --- a/apps/OpenSpace/ext/sgct +++ b/apps/OpenSpace/ext/sgct @@ -1 +1 @@ -Subproject commit 575839eae2a101682f3620a9842cc6fb6d11a266 +Subproject commit a29d90e30cb15359a59179c57eecef0e8a23eec5 diff --git a/ext/ghoul b/ext/ghoul index f819f18803..5e70561a05 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit f819f18803cdfd479fe80e18816c0fe800b64910 +Subproject commit 5e70561a05142c6bbb2484399b6816f61ce01bf7 diff --git a/modules/server/src/serverinterface.cpp b/modules/server/src/serverinterface.cpp index 49b62d55b9..31f0add5ec 100644 --- a/modules/server/src/serverinterface.cpp +++ b/modules/server/src/serverinterface.cpp @@ -27,6 +27,7 @@ #include #include +#include namespace {