Update travis-ci to use the new more flexible BUILD_OSG_PLUGINS_BY_DEFAULT

This commit is contained in:
scrawl 2017-02-07 20:24:03 +01:00
parent c1dd0eb348
commit 23cad1eedd

View File

@ -12,7 +12,7 @@ matrix:
dist: trusty dist: trusty
language: cpp language: cpp
env: env:
- CMAKECMD_ARGS="-DBUILD_OSG_EXAMPLES=ON -DBUILD_OSG_PLUGINS=ON -DBUILD_OSG_APPLICATIONS=ON" - CMAKECMD_ARGS="-DBUILD_OSG_EXAMPLES=ON -DBUILD_OSG_PLUGINS_BY_DEFAULT=ON -DBUILD_OSG_APPLICATIONS=ON"
#- LLVM_VERSION=3.8 #- LLVM_VERSION=3.8
sudo: false sudo: false
cache: cache:
@ -44,11 +44,11 @@ matrix:
- os: osx - os: osx
language: cpp language: cpp
env: env:
- CMAKECMD_ARGS="-DBUILD_OSG_EXAMPLES=OFF -DBUILD_OSG_PLUGINS=ON -DBUILD_OSG_APPLICATIONS=ON" - CMAKECMD_ARGS="-DBUILD_OSG_EXAMPLES=OFF -DBUILD_OSG_PLUGINS_BY_DEFAULT=ON -DBUILD_OSG_APPLICATIONS=ON"
- os: osx - os: osx
language: cpp language: cpp
env: env:
- CMAKECMD_ARGS="-DBUILD_OSG_EXAMPLES=ON -DBUILD_OSG_PLUGINS=OFF -DBUILD_OSG_APPLICATIONS=OFF" - CMAKECMD_ARGS="-DBUILD_OSG_EXAMPLES=ON -DBUILD_OSG_PLUGINS_BY_DEFAULT=OFF -DBUILD_OSG_APPLICATIONS=OFF"
# script: # script:
# - mkdir build # - mkdir build