mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-04-27 06:19:51 -05:00
Matthew Territo
406e892fab
* master: (152 commits) Alex's recommended changes in pull #357. Add check for log directory existence and creation build fix, cannot bind non-const lvalue reference changes from PR comments Fix config file. Merge. build fix by using new path to lib and adding CMake include paths link to right directory for ext lib CMakeLists nitpicky no new line in for url update libTUIO11 submodule libTUIO11 as submodule remove old libTUIO use libTUIO as submodule spaces instead of tabs Add the ability to add OpenGL error checking and function call logging though the openspace.cfg file Automatically set SGCT_SPOUT_SUPPORT when OPENSPACE_SPOUT_SUPPORT is set no powerwall by default make touchmarkers render on render callback over postdraw build fix due to lua URL change std on all algorithms limit finger input to LMA to 3 (makes it easier to converge on 3+ cases) improve LMA converging ability on zoom cases and limit max iterations to 3k instead of 5k ... # Conflicts: # Jenkinsfile # openspace.cfg
81 lines
2.2 KiB
Groovy
81 lines
2.2 KiB
Groovy
def modules = [
|
|
"base",
|
|
"debugging",
|
|
"fieldlines",
|
|
"galaxy",
|
|
"globebrowsing",
|
|
"iswa",
|
|
"kameleon",
|
|
"kameleonvolume",
|
|
"multiresvolume",
|
|
"newhorizons",
|
|
"onscreengui",
|
|
"space",
|
|
"toyvolume",
|
|
"volume"
|
|
];
|
|
|
|
def flags = "-DGHOUL_USE_DEVIL=OFF "
|
|
|
|
for (module in modules) {
|
|
flags += "-DOPENSPACE_OPENSPACE_MODULE_" + module.toUpperCase() + "=ON "
|
|
}
|
|
|
|
echo flags
|
|
|
|
stage('Build') {
|
|
parallel linux: {
|
|
node('linux') {
|
|
timeout(time: 30, unit: 'MINUTES') {
|
|
checkout scm
|
|
sh 'git submodule update --init --recursive'
|
|
sh '''
|
|
mkdir -p build
|
|
cd build
|
|
cmake .. ''' +
|
|
flags + ''' ..
|
|
make -j2
|
|
'''
|
|
}
|
|
}
|
|
},
|
|
windows: {
|
|
node('windows') {
|
|
timeout(time: 30, unit: 'MINUTES') {
|
|
checkout scm
|
|
bat '''
|
|
git submodule update --init --recursive
|
|
if not exist "build" mkdir "build"
|
|
cd build
|
|
cmake -G "Visual Studio 15 2017 Win64" .. ''' +
|
|
flags + ''' ..
|
|
msbuild.exe OpenSpace.sln /nologo /verbosity:minimal /m:2 /p:Configuration=Debug
|
|
'''
|
|
}
|
|
}
|
|
},
|
|
osx: {
|
|
node('osx') {
|
|
timeout(time: 30, unit: 'MINUTES') {
|
|
checkout scm
|
|
sh 'git submodule update --init --recursive'
|
|
sh '''
|
|
export PATH=${PATH}:/usr/local/bin:/Applications/CMake.app/Contents/bin
|
|
export CMAKE_BUILD_TOOL=/Applications/CMake.app/Contents/bin/CMake
|
|
srcDir=$PWD
|
|
if [ ! -d ${srcDir} ]; then
|
|
mkdir ${srcDir}
|
|
fi
|
|
if [ ! -d ${srcDir}/build ]; then
|
|
mkdir ${srcDir}/build
|
|
fi
|
|
cd ${srcDir}/build
|
|
/Applications/CMake.app/Contents/bin/cmake -G Xcode ${srcDir} .. ''' +
|
|
flags + '''
|
|
xcodebuild -quiet
|
|
'''
|
|
}
|
|
}
|
|
}
|
|
}
|