|
|
@@ -55,17 +55,17 @@ before_script:
|
|
|
|
|
|
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
|
|
|
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew outdated wget || brew upgrade wget; fi
|
|
|
-#- if [ "$TRAVIS_OS_NAME" == "osx" ]; then wget https://github.com/paulsapps/Ogre1.9/releases/download/1.9.0/OgreSDK_v1-9-0.dmg; fi
|
|
|
-#- if [ "$TRAVIS_OS_NAME" == "osx" ]; then hdiutil attach OgreSDK_v1-9-0.dmg; fi
|
|
|
-#- if [ "$TRAVIS_OS_NAME" == "osx" ]; then ls; fi
|
|
|
-#- 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 ls /Volumes/OgreSDK/OgreSDK/CMake; fi
|
|
|
+- if [ "$TRAVIS_OS_NAME" == "osx" ]; then wget https://github.com/paulsapps/Ogre1.9/releases/download/1.9.0/OgreSDK_v1-9-0.dmg; fi
|
|
|
+- if [ "$TRAVIS_OS_NAME" == "osx" ]; then hdiutil attach OgreSDK_v1-9-0.dmg; fi
|
|
|
+- if [ "$TRAVIS_OS_NAME" == "osx" ]; then ls; fi
|
|
|
+- 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 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 outdated ogre || brew upgrade ogre; fi
|
|
|
+- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew outdated ois || brew upgrade ois; fi
|
|
|
|
|
|
#- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew outdated scp || brew outdated scp; fi
|
|
|
- $CXX --version
|
|
|
@@ -75,9 +75,9 @@ script:
|
|
|
- mkdir build_qgears
|
|
|
- cd build_qgears
|
|
|
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cmake ..; fi
|
|
|
-#- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export OGRE_HOME=/Volumes/OgreSDK/OgreSDK; fi
|
|
|
-#- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export OGRE_SDK=/Volumes/OgreSDK/OgreSDK; fi
|
|
|
-#- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cmake -DCMAKE_INSTALL_PREFIX=/usr /Volumes/OgreSDK/OgreSDK; fi
|
|
|
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export OGRE_HOME=/Volumes/OgreSDK/OgreSDK; fi
|
|
|
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export OGRE_SDK=/Volumes/OgreSDK/OgreSDK; fi
|
|
|
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cmake -DCMAKE_INSTALL_PREFIX=/usr /Volumes/OgreSDK/OgreSDK; fi
|
|
|
#- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then make install /Volumes/OgreSDK/OgreSDK; fi
|
|
|
|
|
|
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cmake -GXcode ..; fi
|
paulsapps