sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Travis build: client build temporarily disabled.

Browse source
This commit is contained in:
redtide 2019-09-21 20:47:29 -06:00
parent 39e1ce0c17
commit ed47ae2a8b
5 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -16,5 +16,7 @@ compile_commands.json
*.a *.a
*.txt.user *.txt.user
.DS_Store
clients/sfizz_jack clients/sfizz_jack
clients/sfzprint clients/sfzprint

2
.travis/script.sh
View file

@ -11,6 +11,6 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
make -j$(nproc) make -j$(nproc)
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
mkdir build && cd build mkdir build && cd build
cmake -D CMAKE_BUILD_TYPE=Release -D SFIZZ_CLIENTS=ON -G Xcode .. cmake -D SFIZZ_CLIENTS=OFF -G Xcode .. # FIXME: client build
xcodebuild -project sfizz.xcodeproj -alltargets -configuration Release build xcodebuild -project sfizz.xcodeproj -alltargets -configuration Release build
fi fi

7
CMakeLists.txt
View file

@ -67,6 +67,13 @@ if (WIN32)
set_target_properties(sndfile PROPERTIES LINKER_LANGUAGE CXX) set_target_properties(sndfile PROPERTIES LINKER_LANGUAGE CXX)
file(COPY "${WIN_SNDFILE_PATH}/bin/libsndfile-1.dll" DESTINATION ${CMAKE_BINARY_DIR}) file(COPY "${WIN_SNDFILE_PATH}/bin/libsndfile-1.dll" DESTINATION ${CMAKE_BINARY_DIR})
target_include_directories(sndfile INTERFACE "${WIN_SNDFILE_PATH}/include") target_include_directories(sndfile INTERFACE "${WIN_SNDFILE_PATH}/include")
elseif(APPLE)
find_path(SNDFILE_INCLUDE_DIR NAMES sndfile.hh PATHS "/usr/local/include")
find_library(SNDFILE_LIBRARY NAMES sndfile PATHS "/usr/local/lib")
message(STATUS "include dir: " ${SNDFILE_INCLUDE_DIR} " lib: " ${SNDFILE_LIBRARY})
add_library(sndfile SHARED IMPORTED GLOBAL)
target_include_directories(sndfile INTERFACE ${SNDFILE_INCLUDE_DIR})
target_link_libraries(sndfile INTERFACE ${SNDFILE_LIBRARY})
endif() endif()
add_subdirectory(sfizz) add_subdirectory(sfizz)

9
clients/CMakeLists.txt
View file

@ -6,5 +6,14 @@ target_link_libraries(sfzprint sfizz::parser absl::flags_parse)
############################### ###############################
# Basic command line program # Basic command line program
if(APPLE)
find_path(JACK_INCLUDE_DIR NAMES jack.h PATHS "/usr/local/include/jack")
find_library(JACK_LIBRARY NAMES jack PATHS "/usr/local/lib")
message(STATUS "include dir: " ${JACK_INCLUDE_DIR} " lib: " ${JACK_LIBRARY})
add_library(jack SHARED IMPORTED GLOBAL)
target_include_directories(jack INTERFACE ${JACK_INCLUDE_DIR})
target_link_libraries(jack INTERFACE ${JACK_LIBRARY})
endif()
add_executable(sfizz_jack jack_client.cpp) add_executable(sfizz_jack jack_client.cpp)
target_link_libraries(sfizz_jack sfizz::sfizz jack absl::flags_parse) target_link_libraries(sfizz_jack sfizz::sfizz jack absl::flags_parse)

4
sfizz/CMakeLists.txt
View file

@ -14,7 +14,9 @@ set(SFIZZ_SOURCES
include(CheckIncludeFiles) include(CheckIncludeFiles)
CHECK_INCLUDE_FILES(x86intrin.h HAVE_X86INTRIN_H) CHECK_INCLUDE_FILES(x86intrin.h HAVE_X86INTRIN_H)
CHECK_INCLUDE_FILES(intrin.h HAVE_INTRIN_H) CHECK_INCLUDE_FILES(intrin.h HAVE_INTRIN_H)
CHECK_INCLUDE_FILES(arm_neon.h HAVE_ARM_NEON_H) if (!APPLE)
CHECK_INCLUDE_FILES(arm_neon.h HAVE_ARM_NEON_H)
endif()
# SIMD checks # SIMD checks
if (HAVE_X86INTRIN_H AND UNIX) if (HAVE_X86INTRIN_H AND UNIX)