hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #294 from Lukas-W/stable-0.4

Browse Source 
Fix wrong quoting in CMake
This commit is contained in:
Tobias Doerffel
2014-02-10 15:32:57 +01:00
parent c6a6feb588 c41f8e6528
commit 0c63d7cf5e
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@@ -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
script: cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .. && make -j8 VERBOSE=1

2
plugins/zynaddsubfx/CMakeLists.txt
View File

@@ -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)

2
plugins/zynaddsubfx/fltk/CMakeLists.txt
View File

@@ -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)