From f01ac4eeb4c71d8047f4c7168aa8af23663c35ba Mon Sep 17 00:00:00 2001 From: redtide Date: Sun, 1 Dec 2019 15:37:33 +0100 Subject: [PATCH] Fixing Travis build --- .travis/script.sh | 4 ++-- lv2/CMakeLists.txt | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis/script.sh b/.travis/script.sh index 66692662..96174a47 100755 --- a/.travis/script.sh +++ b/.travis/script.sh @@ -7,10 +7,10 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then gcc -v && g++ -v && cmake --version && /usr/local/bin/cmake --version && $SHELL --version mkdir build && cd build - /usr/local/bin/cmake -D CMAKE_BUILD_TYPE=Debug -D SFIZZ_CLIENTS=ON .. + /usr/local/bin/cmake .. make -j$(nproc) elif [ "$TRAVIS_OS_NAME" = "osx" ]; then 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 fi diff --git a/lv2/CMakeLists.txt b/lv2/CMakeLists.txt index 7ea112c5..84f1dbee 100644 --- a/lv2/CMakeLists.txt +++ b/lv2/CMakeLists.txt @@ -1,5 +1,9 @@ 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 set (LV2PLUGIN_PRJ_NAME "${CMAKE_PROJECT_NAME}_lv2") @@ -23,6 +27,7 @@ set (LV2PLUGIN_TTL_SRC_FILES ${CMAKE_PROJECT_NAME}.ttl.in ) 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}) if (ENABLE_LTO)