zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2024-11-30 16:01:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

disable unit tests on macosx

Browse source 
libintl is not found for some reason
This commit is contained in:
derselbst 2018-04-07 11:13:48 +02:00
parent 4ce0e3eced
commit 87bbba9069
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.travis.yml
View file

@ -178,17 +178,17 @@ matrix:
- os: osx - os: osx
osx_image: xcode8 osx_image: xcode8
env: env:
- MATRIX_EVAL="brew install gcc5 glib && CC=gcc-5 && CXX=g++-5" - MATRIX_EVAL="brew install gcc5 glib gettext && brew link gettext && CC=gcc-5 && CXX=g++-5" # gettext should provide libintl, but doesnt work
- os: osx - os: osx
osx_image: xcode8 osx_image: xcode8
env: env:
- MATRIX_EVAL="brew install gcc6 glib && CC=gcc-6 && CXX=g++-6" - MATRIX_EVAL="brew install gcc6 glib gettext && brew link gettext && CC=gcc-6 && CXX=g++-6"
- os: osx - os: osx
osx_image: xcode8 osx_image: xcode8
env: env:
- MATRIX_EVAL="brew install gcc glib libsndfile jack dbus-glib pulseaudio portaudio && CC=gcc-7 && CXX=g++-7" - MATRIX_EVAL="brew install gcc glib gettext libsndfile jack dbus-glib pulseaudio portaudio && brew link gettext && CC=gcc-7 && CXX=g++-7"
before_install: before_install:
- if [ $TRAVIS_OS_NAME = linux ]; then sudo apt-get update; else brew update; fi - if [ $TRAVIS_OS_NAME = linux ]; then sudo apt-get update; else brew update; fi
@ -201,6 +201,4 @@ before_script:
script: script:
- cmake -DCMAKE_INSTALL_PREFIX=$HOME/fluidsynth_install ${CMAKE_FLAGS} "-Denable-portaudio=1" "-Denable-ladspa=1" "-DCMAKE_BUILD_TYPE=RelWithDebInfo" .. - cmake -DCMAKE_INSTALL_PREFIX=$HOME/fluidsynth_install ${CMAKE_FLAGS} "-Denable-portaudio=1" "-Denable-ladspa=1" "-DCMAKE_BUILD_TYPE=RelWithDebInfo" ..
- make -j4 - make -j4
- if [ $TRAVIS_OS_NAME = linux ]; then make install; fi # install only on linux, as CMAKE_INSTALL_PREFIX is ignored for frameworks on macosx and I cant tell whether that's correct or a bug - if [ $TRAVIS_OS_NAME = linux ]; then make install; cmake -Denable-tests=1 ..; make check; fi # install only on linux, as CMAKE_INSTALL_PREFIX is ignored for frameworks on macosx and I cant tell whether that's correct or a bug. also build unit test only on linux, as libintl is not found on macosx
- cmake -Denable-tests=1 ..
- make check

1
src/CMakeLists.txt
View file

@ -358,6 +358,7 @@ if ( MACOSX_FRAMEWORK )
install ( TARGETS fluidsynth libfluidsynth install ( TARGETS fluidsynth libfluidsynth
RUNTIME DESTINATION ${BIN_INSTALL_DIR} RUNTIME DESTINATION ${BIN_INSTALL_DIR}
FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR} FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR}
ARCHIVE DESTINATION ${FRAMEWORK_INSTALL_DIR}
) )
else ( MACOSX_FRAMEWORK ) else ( MACOSX_FRAMEWORK )
install ( TARGETS fluidsynth libfluidsynth install ( TARGETS fluidsynth libfluidsynth