mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-02-22 12:59:07 -06:00
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
This commit is contained in:
4
Jenkinsfile
vendored
4
Jenkinsfile
vendored
@@ -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
|
||||
'''
|
||||
}
|
||||
}
|
||||
|
||||
Submodule apps/OpenSpace/ext/sgct updated: 575839eae2...a29d90e30c
Submodule ext/ghoul updated: f819f18803...5e70561a05
@@ -27,6 +27,7 @@
|
||||
|
||||
#include <ghoul/io/socket/tcpsocketserver.h>
|
||||
#include <ghoul/io/socket/websocketserver.h>
|
||||
#include <functional>
|
||||
|
||||
namespace {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user