Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

another try to fix the OS X build in Travis

Browse source 
it seems that Homebrew installs some packages into /usr/local/opt so by
setting CMAKE_INSTALL_PREFIX to that path find_library() and such should
look there first

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2016-07-31 15:45:15 +00:00
parent 653d996561
commit b981aae566
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.travis.yml
View file

@ -11,8 +11,7 @@ cache: ccache
git:
depth: 3
before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libpng jpeg-turbo libtiff ; fi
# - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq ; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -qq python-dev libssl-dev zlib1g-dev libc6-dev libpng12-dev libjpeg-dev libtiff5-dev libmng-dev libcups2-dev libasound2-dev libfreetype6-dev libfontconfig1-dev libicu-dev libglib2.0-dev libdbus-1-dev libgtk2.0-dev libgl1-mesa-dev libwayland-dev unixodbc-dev libpq-dev libmysqld-dev libaio-dev libsqlite3-dev xorg-dev ; fi
before_script:
@ -21,7 +20,7 @@ before_script:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sleep 3 ; fi
script:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cmake -DENABLE_TESTING=TRUE -Wno-dev ; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cmake -DENABLE_TESTING=TRUE -Wno-dev -DMYSQL_LIBRARIES:STRING="-lmysqld -lcrypt -laio" ; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cmake -DENABLE_TESTING=TRUE -Wno-dev -DMYSQL_LIBRARIES:STRING="-lmysqld -lcrypt -laio" -DCMAKE_INSTALL_PREFIX=/usr/local/opt; fi
- make
- ctest -V
# - make test