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

Fixing Travis build

Browse source
This commit is contained in:
redtide 2019-12-01 15:37:33 +01:00
parent 290ac5fc7b
commit f01ac4eeb4
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.travis/script.sh
View file

@ -7,10 +7,10 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
gcc -v && g++ -v && cmake --version && /usr/local/bin/cmake --version && $SHELL --version gcc -v && g++ -v && cmake --version && /usr/local/bin/cmake --version && $SHELL --version
mkdir build && cd build mkdir build && cd build
/usr/local/bin/cmake -D CMAKE_BUILD_TYPE=Debug -D SFIZZ_CLIENTS=ON .. /usr/local/bin/cmake ..
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 SFIZZ_CLIENTS=OFF -G Xcode .. # FIXME: client build cmake -D SFIZZ_JACK=OFF -G Xcode .. # FIXME: client build
xcodebuild -project sfizz.xcodeproj -alltargets -configuration Debug build xcodebuild -project sfizz.xcodeproj -alltargets -configuration Debug build
fi fi

5
lv2/CMakeLists.txt
View file

@ -1,5 +1,9 @@
project (lv2plugin) project (lv2plugin)
# Dependencies check
find_package (PkgConfig)
pkg_check_modules (LV2 lv2>=1.10.0 REQUIRED)
# CMAKE_PROJECT_NAME is the top level project name, not the current one # CMAKE_PROJECT_NAME is the top level project name, not the current one
set (LV2PLUGIN_PRJ_NAME "${CMAKE_PROJECT_NAME}_lv2") set (LV2PLUGIN_PRJ_NAME "${CMAKE_PROJECT_NAME}_lv2")
@ -23,6 +27,7 @@ set (LV2PLUGIN_TTL_SRC_FILES
${CMAKE_PROJECT_NAME}.ttl.in ${CMAKE_PROJECT_NAME}.ttl.in
) )
add_library (${LV2PLUGIN_PRJ_NAME} SHARED ${CMAKE_PROJECT_NAME}.c ${LV2PLUGIN_TTL_SRC_FILES}) add_library (${LV2PLUGIN_PRJ_NAME} SHARED ${CMAKE_PROJECT_NAME}.c ${LV2PLUGIN_TTL_SRC_FILES})
target_include_directories (${LV2PLUGIN_PRJ_NAME} PRIVATE ${LV2_INCLUDE_DIRS})
target_link_libraries (${LV2PLUGIN_PRJ_NAME} ${CMAKE_PROJECT_NAME}::${CMAKE_PROJECT_NAME}) target_link_libraries (${LV2PLUGIN_PRJ_NAME} ${CMAKE_PROJECT_NAME}::${CMAKE_PROJECT_NAME})
if (ENABLE_LTO) if (ENABLE_LTO)