travis-ci: reenable osx.

pull/1299/head
Kim Kulling 2017-06-06 16:57:19 +02:00
parent 6730d658d7
commit 074caf971b
1 changed files with 3 additions and 5 deletions

View File

@ -1,10 +1,8 @@
language: cpp language: cpp
before_install: before_install:
- sudo apt-get update -qq - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq && sudo apt-get install cmake && sudo apt-get install cmake python3 && sudo apt-get install -qq freeglut3-dev libxmu-dev libxi-dev ; fi
- sudo apt-get install cmake - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install cmake python3 freeglut3-dev libxmu-dev libxi-dev
- sudo apt-get install cmake python3
- if [ $LINUX ]; then sudo apt-get install -qq freeglut3-dev libxmu-dev libxi-dev ; fi
- echo -e "#ifndef A_R_H_INC\n#define A_R_H_INC\n#define GitVersion ${TRAVIS_JOB_ID}\n#define GitBranch \"${TRAVIS_BRANCH}\"\n#endif // A_R_H_INC" > revision.h - echo -e "#ifndef A_R_H_INC\n#define A_R_H_INC\n#define GitVersion ${TRAVIS_JOB_ID}\n#define GitBranch \"${TRAVIS_BRANCH}\"\n#endif // A_R_H_INC" > revision.h
# install latest LCOV (1.9 was failing) # install latest LCOV (1.9 was failing)
- cd ${TRAVIS_BUILD_DIR} - cd ${TRAVIS_BUILD_DIR}
@ -50,7 +48,7 @@ script:
- . ./.travis.sh - . ./.travis.sh
os: os:
- linux - linux
#- osx - osx
after_success: after_success:
- cd ${TRAVIS_BUILD_DIR} - cd ${TRAVIS_BUILD_DIR}