Merge branch 'master' of https://github.com/q-gears/q-gears.git

.travis.yml

@@ -56,6 +56,10 @@ 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 wget https://github.com/paulsapps/Ogre1.9/releases/download/1.9.0/OgreDependencies_OSX_libc._20130610.zip; fi
+- if [ "$TRAVIS_OS_NAME" == "osx" ]; then wget https://github.com/paulsapps/Ogre1.9/releases/download/1.9.0/NVIDIA_Cg.tgz; 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
@@ -64,17 +68,38 @@ before_script:
 - 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 boost || brew upgrade boost; 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
 
 before_install: 
 script: 
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo tar xfzC NVIDIA_Cg.tgz /; fi
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cginfo; fi
+
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then unzip OgreDependencies_OSX_libc._20130610.zip >> extract.log; fi
+
 - 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 cmake ..; fi
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export OGRE_SDK=/Volumes/OgreSDK/OgreSDK; fi
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export OIS_HOME=/Users/travis/build/q-gears/q-gears/Dependencies; 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
+- if [ "$TRAVIS_OS_NAME" == "osx" ]; then ls .; fi
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then xcodebuild; fi
+
+
+#- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cat /Users/travis/build/q-gears/q-gears/build_qgears/CMakeFiles/CMakeOutput.log; fi
+
 - if [[ ${COVERITY_SCAN_BRANCH} != 1 ]]; then make -j2; fi
 - if [[ ${COVERITY_SCAN_BRANCH} != 1 ]]; then cpack -C Release; fi
 language: cpp

CMakeLists.txt

@@ -7,6 +7,16 @@ set(QGears_VERSION_MAJOR 0)
 set(QGears_VERSION_MINOR 22)
 set(QGears_VERSION_PATCH 0)
 
+set(CMAKE_FRAMEWORK_PATH
+      ${CMAKE_FRAMEWORK_PATH}
+      /Volumes/OgreSDK/OgreSDK/lib/macosx/Release
+      /Volumes/OgreSDK/OgreSDK/lib/macosx/Debug
+   )
+
+set(OGRE_FRAMEWORK_INCLUDES
+    /Volumes/OgreSDK/OgreSDK/include
+)
+
 option(QGears_BUILD_PLUGINS     "Build the plugins"     TRUE)
 option(QGears_BUILD_UTILITIES   "Build the utilities"   TRUE)
 option(QGears_BUILD_TESTS       "Build the unit tests"  TRUE)
@@ -19,6 +29,7 @@ find_path(OGRE_CMAKE_MODULE_PATH FindOGRE.cmake
     "/usr/local/lib/OGRE/cmake"
     "/usr/lib/OGRE/cmake"
     "/usr/share/OGRE/cmake/modules"
+    "/Volumes/OgreSDK/OgreSDK/CMake"
 )
 if(OGRE_CMAKE_MODULE_PATH-NOTFOUND)
     message(SEND_ERROR "Failed to find OGRE module path.")