From b89bc24a9871c4ba746b556a52e1b1bbe74d7f4e Mon Sep 17 00:00:00 2001 From: redtide Date: Sun, 22 Sep 2019 01:20:53 +0200 Subject: [PATCH] Fix Travis OSX build (libsndfile). --- .travis/before_install.sh | 2 +- CMakeLists.txt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis/before_install.sh b/.travis/before_install.sh index 349edbfc..248954a6 100755 --- a/.travis/before_install.sh +++ b/.travis/before_install.sh @@ -10,5 +10,5 @@ elif [ "$TRAVIS_OS_NAME" = "osx" ]; then sudo ln -s /usr/local /opt/local brew update brew upgrade cmake - brew install jack libsndfile + brew install jack fi diff --git a/CMakeLists.txt b/CMakeLists.txt index 95862d44..c42efe4f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,6 +67,10 @@ if (WIN32) set_target_properties(sndfile PROPERTIES LINKER_LANGUAGE CXX) file(COPY "${WIN_SNDFILE_PATH}/bin/libsndfile-1.dll" DESTINATION ${CMAKE_BINARY_DIR}) target_include_directories(sndfile INTERFACE "${WIN_SNDFILE_PATH}/include") +elseif (APPLE) + add_library(sndfile STATIC IMPORTED) + set_target_properties(sndfile PROPERTIES LINKER_LANGUAGE CXX) + target_include_directories(sndfile INTERFACE "usr/local/include") endif() add_subdirectory(sfizz)