From 7fefaca34547e46142d076986afe336d861a0165 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Wed, 23 Jan 2019 10:17:15 -0500
Subject: [PATCH] Feature/jenkins (#788)

* Update Jenkinsfile
* Fix compilation for OSX
* Update SGCT to fix Jenkins compile issue on Ubuntu
* Make OSX Jenkins build not quiet
* Only build OpenSpace target on Mac
---
 Jenkinsfile                            | 4 ++--
 apps/OpenSpace/ext/sgct                | 2 +-
 ext/ghoul                              | 2 +-
 modules/server/src/serverinterface.cpp | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

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 <ghoul/io/socket/tcpsocketserver.h>
 #include <ghoul/io/socket/websocketserver.h>
+#include <functional>
 
 namespace {