diff options
| author |  bunnei | 2014-11-15 22:37:03 -0500 |
|---|---|---|
| committer | bunnei | 2014-11-15 22:37:03 -0500 |
| commit | 4409fa87985f4445f1c44810ef27fac2a78a09db (patch) | |
| tree | 2f12f8eb2b1bc1dd6a5120db5111fff5fa52fede | |
| parent | Merge pull request #159 from SeannyM/enable_log (diff) | |
| parent | Set Qt5_DIR in Travis to allow cmake to find Qt5 libraries. (diff) | |
| download | yuzu-4409fa87985f4445f1c44810ef27fac2a78a09db.tar.gz yuzu-4409fa87985f4445f1c44810ef27fac2a78a09db.tar.xz yuzu-4409fa87985f4445f1c44810ef27fac2a78a09db.zip | |
Merge pull request #197 from archshift/osx
OS X Travis improvements
| -rw-r--r-- | .travis-build.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis-build.sh b/.travis-build.sh index 672d282cc..78e7583a8 100644 --- a/.travis-build.sh +++ b/.travis-build.sh | |||
| @@ -8,6 +8,7 @@ if [ "$TRAVIS_OS_NAME" = linux -o -z "$TRAVIS_OS_NAME" ]; then | |||
| 8 | cmake -DUSE_QT5=OFF .. | 8 | cmake -DUSE_QT5=OFF .. |
| 9 | make -j4 | 9 | make -j4 |
| 10 | elif [ "$TRAVIS_OS_NAME" = osx ]; then | 10 | elif [ "$TRAVIS_OS_NAME" = osx ]; then |
| 11 | export Qt5_DIR=$(brew --prefix)/opt/qt5 | ||
| 11 | mkdir build && cd build | 12 | mkdir build && cd build |
| 12 | cmake .. -GXcode | 13 | cmake .. -GXcode |
| 13 | xcodebuild | 14 | xcodebuild |