From 568d0de8e5661532a82bbc6458441d5849b8373b Mon Sep 17 00:00:00 2001 From: Lukas W Date: Mon, 10 Feb 2014 14:44:45 +0100 Subject: [PATCH 1/3] Revert ab44ef221e libfreetype6-dev is not necessary, it is already part of other dependencies. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fd7bb2791..b16a73e8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: cpp compiler: gcc before_install: sudo apt-get update -install: sudo apt-get install libqt4-dev libsndfile-dev fftw3-dev libvorbis-dev libogg-dev libasound2-dev libjack-dev libsdl-dev libsamplerate0-dev libstk0-dev libfluidsynth-dev portaudio19-dev wine-dev g++-multilib libfreetype6-dev +install: sudo apt-get install libqt4-dev libsndfile-dev fftw3-dev libvorbis-dev libogg-dev libasound2-dev libjack-dev libsdl-dev libsamplerate0-dev libstk0-dev libfluidsynth-dev portaudio19-dev wine-dev g++-multilib before_script: mkdir build && cd build script: cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .. && make -j8 From 58796a6d154ace24645f0d4e6178ff4a8c84ab35 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Mon, 10 Feb 2014 14:45:18 +0100 Subject: [PATCH 2/3] Add verbose make output to Travis CI --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b16a73e8e..56c40d073 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,4 +3,4 @@ compiler: gcc before_install: sudo apt-get update install: sudo apt-get install libqt4-dev libsndfile-dev fftw3-dev libvorbis-dev libogg-dev libasound2-dev libjack-dev libsdl-dev libsamplerate0-dev libstk0-dev libfluidsynth-dev portaudio19-dev wine-dev g++-multilib before_script: mkdir build && cd build -script: cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .. && make -j8 +script: cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .. && make -j8 VERBOSE=1 From c41f8e6528d30add23b34d2335e48f1520212376 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Mon, 10 Feb 2014 15:23:54 +0100 Subject: [PATCH 3/3] Fix a CMake quote sign problem Caused by 95b0a4305ef8334bd4404983ab2195ce0e335f34 --- plugins/zynaddsubfx/CMakeLists.txt | 2 +- plugins/zynaddsubfx/fltk/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/zynaddsubfx/CMakeLists.txt b/plugins/zynaddsubfx/CMakeLists.txt index 17e7c88fd..4d9321c49 100644 --- a/plugins/zynaddsubfx/CMakeLists.txt +++ b/plugins/zynaddsubfx/CMakeLists.txt @@ -134,5 +134,5 @@ IF(NOT FREETYPE_INCLUDE_DIR_freetype2) SET(FREETYPE_INCLUDE_DIR_freetype2 "${FREETYPE_INCLUDE_DIR_ft2build}/freetype2") ENDIF() -ADD_CUSTOM_TARGET(libfltk COMMAND mkdir -p "\"${CMAKE_CURRENT_BINARY_DIR}/fltk\"" && cd "\"${CMAKE_CURRENT_BINARY_DIR}/fltk\"" && "\"${CMAKE_COMMAND}\"" "\"${CMAKE_CURRENT_SOURCE_DIR}/fltk\"" ${FLTK_EXTRA_FLAGS} "-DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/cmake/modules/" -DFLTK_USE_SYSTEM_ZLIB:BOOL=ON -DFLTK_USE_SYSTEM_JPEG:BOOL=ON -DFLTK_USE_SYSTEM_PNG:BOOL=ON -DOPTION_BUILD_EXAMPLES:BOOL=OFF -DCMAKE_BUILD_TYPE=release -DFREETYPE_PATH="${FREETYPE_INCLUDE_DIR_freetype2}\;${FREETYPE_INCLUDE_DIR_ft2build}" && "\"${CMAKE_BUILD_TOOL}\"") +ADD_CUSTOM_TARGET(libfltk COMMAND mkdir -p "\"${CMAKE_CURRENT_BINARY_DIR}/fltk\"" && cd "\"${CMAKE_CURRENT_BINARY_DIR}/fltk\"" && "\"${CMAKE_COMMAND}\"" "\"${CMAKE_CURRENT_SOURCE_DIR}/fltk\"" ${FLTK_EXTRA_FLAGS} "-DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/cmake/modules/" -DFLTK_USE_SYSTEM_ZLIB:BOOL=ON -DFLTK_USE_SYSTEM_JPEG:BOOL=ON -DFLTK_USE_SYSTEM_PNG:BOOL=ON -DOPTION_BUILD_EXAMPLES:BOOL=OFF -DCMAKE_BUILD_TYPE=release -DFREETYPE_PATH="\"${FREETYPE_INCLUDE_DIR_freetype2}\"\;\"${FREETYPE_INCLUDE_DIR_ft2build}\"" && "\"${CMAKE_BUILD_TOOL}\"") ADD_DEPENDENCIES(RemoteZynAddSubFx libfltk) diff --git a/plugins/zynaddsubfx/fltk/CMakeLists.txt b/plugins/zynaddsubfx/fltk/CMakeLists.txt index 5545fce27..b78e97aac 100644 --- a/plugins/zynaddsubfx/fltk/CMakeLists.txt +++ b/plugins/zynaddsubfx/fltk/CMakeLists.txt @@ -167,7 +167,7 @@ mark_as_advanced(HAVE_SYS_STDTYPES_H HAVE_XDBE_H) # where to find freetype headers find_path(FREETYPE_PATH freetype/config/ftheader.h PATH_SUFFIXES freetype2) if(FREETYPE_PATH) - include_directories("${FREETYPE_PATH}") + include_directories(${FREETYPE_PATH}) endif(FREETYPE_PATH) mark_as_advanced(FREETYPE_PATH)