Updated travis.yml to use common build scripts

5 files changed, 4 insertions, 54 deletions

diff --git a/.travis.yml b/.travis.yml
index 5412a74..35b2b20 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,42 +7,8 @@ notifications:
     on_success: never
     on_failure: always
 
-env:
-  global:
-    - CMAKE_VERSION=3.15.4
-
 before_install:
-  - |
-    if [ "$TRAVIS_OS_NAME" = "osx" ];  then
-      wget --no-check-certificate https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Darwin-x86_64.tar.gz
-      tar -xzf cmake-${CMAKE_VERSION}-Darwin-x86_64.tar.gz
-      export PATH=$PWD/cmake-${CMAKE_VERSION}-Darwin-x86_64/CMake.app/Contents/bin:$PATH
-      cmake --version
-    fi
-  - |
-    if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-      # Link gcc-7 and g++-7 to their standard commands
-      sudo ln -s /usr/bin/gcc-7 /usr/local/bin/gcc
-      sudo ln -s /usr/bin/g++-7 /usr/local/bin/g++
-      # Export CC and CXX to tell cmake which compiler to use
-      export CC=/usr/bin/gcc-7
-      export CXX=/usr/bin/g++-7
-      # Check versions of gcc, g++ and cmake
-      gcc -v
-      g++ -v
-      # Download a recent cmake
-      mkdir $HOME/usr
-      export PATH="$HOME/usr/bin:$PATH"
-      wget https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.sh
-      chmod +x cmake-${CMAKE_VERSION}-Linux-x86_64.sh
-      ./cmake-${CMAKE_VERSION}-Linux-x86_64.sh --prefix=$HOME/usr --exclude-subdir --skip-license
-      cmake --version
-      sudo apt-get update
-      sudo apt-get install libx11-dev
-      sudo apt-get install mesa-common-dev
-      sudo apt-get install mesa-utils
-      sudo apt-get install libgl-dev
-    fi
+  - . ./DiligentCore/BuildTools/Scripts/travis/before_install.sh
 
 addons:
   apt:
@@ -52,7 +18,7 @@ addons:
       - gcc-7
       - g++-7
       - cmake
-      
+
 matrix:
   include:
   - os: linux
@@ -83,23 +49,7 @@ matrix:
     env: 
       - CONFIG=Release
       - IOS=true
-    
+
 script:
 
-  # Run cmake
-  - mkdir cmk_build
-  - cd cmk_build
-  - |
-    if [ "$TRAVIS_OS_NAME" = "linux" ]; then 
-      cmake .. -G "Unix Makefiles" -DDILIGENT_ENABLE_TESTS=TRUE -DCMAKE_BUILD_TYPE=${CONFIG}
-      cmake --build .
-    fi
-  - |
-    if [ "$TRAVIS_OS_NAME" = "osx" ]; then 
-      if [ "$IOS" = "true" ]; then 
-        cmake .. -DCMAKE_TOOLCHAIN_FILE=../DiligentCore/ios.toolchain.cmake -DIOS_PLATFORM=SIMULATOR64 -DDILIGENT_ENABLE_TESTS=TRUE -G "Xcode"
-      else
-        cmake .. -DDILIGENT_ENABLE_TESTS=TRUE -G "Xcode"
-      fi
-      xcodebuild -configuration ${CONFIG} | xcpretty
-    fi
+  - . ./DiligentCore/BuildTools/Scripts/travis/build.sh "-DDILIGENT_ENABLE_TESTS=TRUE"
diff --git a/DiligentCore b/DiligentCore
-Subproject 3bade3ee4ca4012dd9476846ae93ada7d1cbc4d
+Subproject ff447b57f5b364be1a4a5d7e07c8183998aa211
diff --git a/DiligentFX b/DiligentFX
-Subproject 78c9388ded7cbc0c0ac80673a2bdf4f8036b8e2
+Subproject 49b98b45649f8a4f360a54536f7819e97332842
diff --git a/DiligentSamples b/DiligentSamples
-Subproject 87504297876f7a72e1edccf3bc4876777bac8e1
+Subproject 32a3a89a9578a861b4ae84533e9ae9c530edd1b
diff --git a/DiligentTools b/DiligentTools
-Subproject a626a9ae127343cc57f779a303496a6d429c80a
+Subproject 8d3069c26420fa9504c991e4294bd35b7808d21