From 6a8fe4554317f8773765b595874f2f861f9e3b42 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 31 Oct 2017 14:55:41 +0000
Subject: [PATCH] Reinstated two stage OSX build, and disabled part of the
 coverity_scan build to attempt to get it running without timeout.

---
 .travis.yml | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index aeb202144..db9085fe4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,7 @@ matrix:
             name: "openscenegraph/OpenSceneGraph"
             description: "OpenSceneGraph build"
           notification_email: robert@openscenegraph.com
-          build_command_prepend: "cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_OSG_DEPRECATED_SERIALIZERS=OFF ."
+          build_command_prepend: "cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_OSG_DEPRECATED_SERIALIZERS=OFF -DBUILD_OSG_EXAMPLES=OFF ."
           build_command:   "make -j 4"
           branch_pattern: coverity_scan
         apt:
@@ -51,22 +51,16 @@ matrix:
          - brew install ccache
          - export PATH="/usr/local/opt/ccache/libexec:$PATH"
       env:
-#         - CMAKECMD_ARGS="-DBUILD_OSG_EXAMPLES=OFF -DBUILD_OSG_PLUGINS_BY_DEFAULT=ON -DBUILD_OSG_APPLICATIONS=ON"
-         - CMAKECMD_ARGS="-DBUILD_OSG_EXAMPLES=ON -DBUILD_OSG_PLUGINS_BY_DEFAULT=ON -DBUILD_OSG_APPLICATIONS=ON"
-#    - os: osx
-#      before_install:
-#         - brew update
-#      install:
-#         - brew install ccache
-#         - export PATH="/usr/local/opt/ccache/libexec:$PATH"
-#      env:
-#         - CMAKECMD_ARGS="-DBUILD_OSG_EXAMPLES=ON -DBUILD_OSG_PLUGINS_BY_DEFAULT=OFF -DBUILD_OSG_APPLICATIONS=OFF"
+         - CMAKECMD_ARGS="-DBUILD_OSG_EXAMPLES=OFF -DBUILD_OSG_PLUGINS_BY_DEFAULT=ON -DBUILD_OSG_APPLICATIONS=ON"
 
-# script:
-#    - mkdir build
-#    - cd build
-#    - travis_wait 60 cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../product -DBUILD_OSG_EXAMPLES=ON ..
-#    - make install -j 3
+    - os: osx
+      before_install:
+         - brew update
+      install:
+         - brew install ccache
+         - export PATH="/usr/local/opt/ccache/libexec:$PATH"
+      env:
+         - CMAKECMD_ARGS="-DBUILD_OSG_EXAMPLES=ON -DBUILD_OSG_PLUGINS_BY_DEFAULT=OFF -DBUILD_OSG_APPLICATIONS=OFF  -DBUILD_OSG_DEPRECATED_SERIALIZERS=OFF"
 
 script:
     - 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