From 7b67ef0c6f0bb1f2716cbdc16d630c141c7f3476 Mon Sep 17 00:00:00 2001 From: Laurens Voerman Date: Fri, 3 Feb 2017 10:01:15 +0100 Subject: [PATCH] split travis-ci apple build into two jobs to avoid job time limit. --- .travis.yml | 10 +++++++++- CMakeLists.txt | 3 +++ src/CMakeLists.txt | 8 +++++--- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index d3bb883ba..2d1a530c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ matrix: dist: trusty language: cpp env: + - CMAKECMD_ARGS="-DBUILD_OSG_EXAMPLES=ON -DBUILD_OSG_PLUGINS=ON -DBUILD_OSG_APPLICATIONS=ON" #- LLVM_VERSION=3.8 sudo: false cache: @@ -42,6 +43,12 @@ matrix: # OSX build - os: osx language: cpp + env: + - CMAKECMD_ARGS="-DBUILD_OSG_EXAMPLES=OFF -DBUILD_OSG_PLUGINS=ON -DBUILD_OSG_APPLICATIONS=ON" + - os: osx + language: cpp + env: + - CMAKECMD_ARGS="-DBUILD_OSG_EXAMPLES=ON -DBUILD_OSG_PLUGINS=OFF -DBUILD_OSG_APPLICATIONS=OFF" # script: # - mkdir build @@ -50,4 +57,5 @@ matrix: # - make install -j 3 script: - - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then mkdir build && cd build && travis_wait 60 cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../product -DBUILD_OSG_EXAMPLES=ON ../ && make -j3 ; fi + - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then mkdir build && cd build && travis_wait 60 cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../product $CMAKECMD_ARGS ../ ; fi + - if [ -f CMakeCache.txt ]; then make -j3 ; fi diff --git a/CMakeLists.txt b/CMakeLists.txt index 326caa5e7..338d3d43f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -700,6 +700,9 @@ OPTION(BUILD_OSG_APPLICATIONS "Enable to build OSG Applications (e.g. osgviewer) # OSG Examples OPTION(BUILD_OSG_EXAMPLES "Enable to build OSG Examples" OFF) +# OSG Plugins disable option for apple build on travis ci test - full build job runs over time limit of 50 min. +OPTION(BUILD_OSG_PLUGINS "Build OSG Plugins - Disable for compile testing examples on a time limit" ON) +mark_as_advanced(BUILD_OSG_PLUGINS) ################################################################################ # 3rd Party Dependency Stuff IF(WIN32 AND NOT ANDROID) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 401688ef3..97a015d8a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -26,13 +26,15 @@ FOREACH( mylibfolder osgTerrain osgWidget osgPresentation - osgWrappers/serializers - osgWrappers/deprecated-dotosg - osgPlugins ) ADD_SUBDIRECTORY(${mylibfolder}) ENDFOREACH() +IF(BUILD_OSG_PLUGINS) + ADD_SUBDIRECTORY(osgWrappers/serializers) + ADD_SUBDIRECTORY(osgWrappers/deprecated-dotosg) + ADD_SUBDIRECTORY(osgPlugins) +ENDIF(BUILD_OSG_PLUGINS)