Commit 1c58babd authored by Pablo Toharia's avatar Pablo Toharia

Fixes for CI.

parent 9101ea68
Pipeline #3525 failed with stage
in 61 minutes and 16 seconds
......@@ -9,6 +9,7 @@ Ubuntu:
- uname -a
- module load Qt-5.5
- module load OpenSceneGraph-3.4.0-Qt5.5
- export CMAKE_EXTRA_ARGS="-DCLONE_SUBPROJECTS=ON"
- export BUILD_GENERATOR="Unix Makefiles";
- bash .gitlab-ci.sh
tags:
......@@ -20,24 +21,26 @@ OSX-Subproject:
- date
- hostname
- uname -a
- module load Qt-5.4
- module load OpenSceneGraph-3.4.0
- module load eigen-3.1.2
- module load Qt-5.9.1
# - module load OpenSceneGraph-3.4.0
# - module load eigen-3.1.2
- export CMAKE_EXTRA_ARGS="-DCLONE_SUBPROJECTS=ON -DGLUT_glut_LIBRARY=/usr/local/Cellar/freeglut/3.0.0/lib/libglut.dylib"
- export BUILD_GENERATOR="Unix Makefiles";
- export CMAKE_OSX_ARCHITECTURES=x86_64
- bash .gitlab-ci.sh
tags:
- osx
- osx-sierra
Win7:
stage: build
script:
- call %ENVFILESDIR%\Boost-1.56-vs12-x64.bat
- call %ENVFILESDIR%\zeromq-4.0.4.bat
- call %ENVFILESDIR%\Qt-5.4.bat
- call %ENVFILESDIR%\OpenSceneGraph-3.4.0-vs12-x64.bat
- set BUILD_GENERATOR=Visual Studio 12 Win64
- set PATH=%PATH%;"c:\\Program Files (x86)\\Git\\bin"
- call %ENVFILESDIR%\Boost-1.64-vs14-x64.bat
- call %ENVFILESDIR%\Qt-5.9-vs14.bat
- call %ENVFILESDIR%\eigen-3.1.2-vs12-x64.bat
- call %ENVFILESDIR%\zeromq-4.2.1-vs14-x64.bat
- set CMAKE_EXTRA_ARGS=-DCLONE_SUBPROJECTS=ON
- set BUILD_GENERATOR=Visual Studio 14 Win64
- set PATH=%PATH%;"c:\Program Files\Git\bin"
- bash.exe --login .gitlab-ci.sh
tags:
- win7
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment