|
|
@@ -28,7 +28,7 @@ before_script:
|
|
|
- echo $CXX
|
|
|
- if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "clang++" ]]; then sudo add-apt-repository ppa:h-rayflood/llvm -y; fi
|
|
|
- echo $CXX
|
|
|
-- if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "clang++" ]]; then sudo apt-get install --allow-unauthenticated -qq clang-3.5; fi
|
|
|
+- if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "clang++" ]]; then sudo apt-get install --allow-unauthenticated clang-3.5; fi
|
|
|
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update; fi
|
|
|
- echo $CXX
|
|
|
- if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "clang++" ]]; then export CXX="clang++-3.4"; fi
|
|
|
@@ -61,7 +61,9 @@ before_script:
|
|
|
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then ls /Volumes; fi
|
|
|
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then ls /Volumes/OgreSDK; fi
|
|
|
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then ls /Volumes/OgreSDK/OgreSDK; fi
|
|
|
-- if [ "$TRAVIS_OS_NAME" == "osx" ]; then sudo installer -pkg /Volumes/OgreSDK/OgreSDK/OgreSDK.pkg -target /usr/local/; fi
|
|
|
+- if [ "$TRAVIS_OS_NAME" == "osx" ]; then ls /Volumes/OgreSDK/OgreSDK/CMake; fi
|
|
|
+
|
|
|
+#- if [ "$TRAVIS_OS_NAME" == "osx" ]; then sudo installer -pkg /Volumes/OgreSDK/OgreSDK/OgreSDK.pkg -target /usr/local/; fi
|
|
|
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew outdated boost || brew upgrade boost; fi
|
|
|
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew scp boost || brew scp boost; fi
|
|
|
- $CXX --version
|
|
|
@@ -70,7 +72,8 @@ before_install:
|
|
|
script:
|
|
|
- mkdir build_qgears
|
|
|
- cd build_qgears
|
|
|
-- cmake ..
|
|
|
+- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; cmake ..; fi
|
|
|
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; cmake .. -DCMAKE_MODULE_PATH=/Volumes/OgreSDK/OgreSDK/CMake; fi
|
|
|
- if [[ ${COVERITY_SCAN_BRANCH} != 1 ]]; then make -j2; fi
|
|
|
- if [[ ${COVERITY_SCAN_BRANCH} != 1 ]]; then cpack -C Release; fi
|
|
|
language: cpp
|
paulsapps