From 95b0a4305ef8334bd4404983ab2195ce0e335f34 Mon Sep 17 00:00:00 2001 From: Markus Elfring Date: Sat, 1 Feb 2014 15:20:27 +0100 Subject: [PATCH] Bug #175: Completed quoting for parameters of some CMake commands A Wiki article pointed out that whitespace will only be preserved for parameters in CMake commands if passed strings will be appropriately quoted or escaped. http://cmake.org/Wiki/CMake/Language_Syntax#CMake_splits_arguments_unless_you_use_quotation_marks_or_escapes. Quoting was added so that more places should also handle file names correctly which contain space characters eventually. Signed-off-by: Markus Elfring --- CMakeLists.txt | 204 ++++++++++-------- data/CMakeLists.txt | 12 +- data/backgrounds/CMakeLists.txt | 2 +- data/locale/CMakeLists.txt | 5 +- plugins/audio_file_processor/CMakeLists.txt | 2 +- plugins/bass_booster/CMakeLists.txt | 2 +- plugins/bit_invader/CMakeLists.txt | 2 +- plugins/kicker/CMakeLists.txt | 2 +- plugins/ladspa_browser/CMakeLists.txt | 2 +- plugins/ladspa_effect/CMakeLists.txt | 2 +- plugins/ladspa_effect/calf/CMakeLists.txt | 11 +- plugins/ladspa_effect/caps/CMakeLists.txt | 4 +- plugins/ladspa_effect/cmt/CMakeLists.txt | 4 +- plugins/ladspa_effect/swh/CMakeLists.txt | 29 +-- plugins/ladspa_effect/tap/CMakeLists.txt | 14 +- plugins/lb302/CMakeLists.txt | 2 +- plugins/lb303/CMakeLists.txt | 2 +- plugins/opl2/CMakeLists.txt | 2 +- plugins/organic/CMakeLists.txt | 2 +- plugins/papu/CMakeLists.txt | 2 +- plugins/patman/CMakeLists.txt | 2 +- plugins/peak_controller_effect/CMakeLists.txt | 2 +- plugins/sf2_player/CMakeLists.txt | 2 +- plugins/sfxr/CMakeLists.txt | 2 +- plugins/sid/CMakeLists.txt | 2 +- plugins/spectrum_analyzer/CMakeLists.txt | 2 +- plugins/stereo_enhancer/CMakeLists.txt | 2 +- plugins/stereo_matrix/CMakeLists.txt | 2 +- plugins/stk/mallets/CMakeLists.txt | 4 +- plugins/vestige/CMakeLists.txt | 13 +- plugins/vibed/CMakeLists.txt | 2 +- plugins/vst_base/CMakeLists.txt | 14 +- plugins/vst_base/Win64/CMakeLists.txt | 15 +- plugins/vst_effect/CMakeLists.txt | 9 +- plugins/zynaddsubfx/CMakeLists.txt | 76 +++---- plugins/zynaddsubfx/fltk/CMakeLists.txt | 141 ++++++------ plugins/zynaddsubfx/fltk/src/CMakeLists.txt | 6 +- plugins/zynaddsubfx/src/Misc/CMakeLists.txt | 4 +- plugins/zynaddsubfx/src/Output/CMakeLists.txt | 4 +- plugins/zynaddsubfx/src/UI/CMakeLists.txt | 2 +- 40 files changed, 317 insertions(+), 296 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b097bf538..90c7b26e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5) PROJECT(lmms) -SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) +SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH}) IF(COMMAND CMAKE_POLICY) CMAKE_POLICY(SET CMP0005 NEW) @@ -84,7 +84,7 @@ CHECK_INCLUDE_FILES(string.h LMMS_HAVE_STRING_H) CHECK_INCLUDE_FILES(process.h LMMS_HAVE_PROCESS_H) CHECK_INCLUDE_FILES(locale.h LMMS_HAVE_LOCALE_H) -LIST(APPEND CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}) +LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}") # check for Qt4 SET(QT_MIN_VERSION "4.3.0" COMPONENTS QtCore QtGui QtXml) @@ -101,7 +101,7 @@ ENDIF(EXISTS "${QT_TRANSLATIONS_DIR}") IF(NOT WIN32) STRING(REPLACE "-DQT_DLL" "" QT_DEFINITIONS "${QT_DEFINITIONS}") ENDIF(NOT WIN32) -INCLUDE(${QT_USE_FILE}) +INCLUDE("${QT_USE_FILE}") # check for libsndfile PKG_CHECK_MODULES(SNDFILE REQUIRED sndfile>=1.0.11) @@ -161,7 +161,7 @@ IF(NOT LMMS_HAVE_SDL) SET(SDL_INCLUDE_DIR "") ELSE(NOT LMMS_HAVE_SDL) IF(NOT SDL_INCLUDE_DIR) - SET(SDL_INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}/include) + SET(SDL_INCLUDE_DIR "${CMAKE_FIND_ROOT_PATH}/include") ENDIF(NOT SDL_INCLUDE_DIR) ENDIF(NOT LMMS_HAVE_SDL) @@ -308,30 +308,30 @@ IF(WANT_SYSTEM_SR) ENDIF(WANT_SYSTEM_SR) IF(NOT LMMS_HAVE_SAMPLERATE) SET(STATUS_SAMPLERATE "bundled") - INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate) + INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate") SET(CMAKE_CROSSCOMPILING_ORIG "${CMAKE_CROSSCOMPILING}") SET(CMAKE_CROSSCOMPILING "") INCLUDE(ChecksForLibSamplerate) SET(LIBSAMPLERATE_SOURCES - ${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate/samplerate.c - ${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate/samplerate.h - ${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate/src_sinc.c - ${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate/high_qual_coeffs.h - ${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate/mid_qual_coeffs.h - ${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate/fastest_coeffs.h - ${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate/common.h - ${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate/src_config.h - ${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate/float_cast.h - ${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate/src_zoh.c - ${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate/src_linear.c) + "${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate/samplerate.c" + "${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate/samplerate.h" + "${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate/src_sinc.c" + "${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate/high_qual_coeffs.h" + "${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate/mid_qual_coeffs.h" + "${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate/fastest_coeffs.h" + "${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate/common.h" + "${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate/src_config.h" + "${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate/float_cast.h" + "${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate/src_zoh.c" + "${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate/src_linear.c") SET(CMAKE_CROSSCOMPILING "${CMAKE_CROSSCOMPILING_ORIG}") ENDIF(NOT LMMS_HAVE_SAMPLERATE) -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/lmmsconfig.h.in ${CMAKE_BINARY_DIR}/lmmsconfig.h) -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/lmmsversion.h.in ${CMAKE_BINARY_DIR}/lmmsversion.h) -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/lmms.rc.in ${CMAKE_BINARY_DIR}/lmms.rc) -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/plugins/zynaddsubfx/zynaddsubfx.rc.in ${CMAKE_BINARY_DIR}/plugins/zynaddsubfx/zynaddsubfx.rc) +CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/lmmsconfig.h.in" "${CMAKE_BINARY_DIR}/lmmsconfig.h") +CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/lmmsversion.h.in" "${CMAKE_BINARY_DIR}/lmmsversion.h") +CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/lmms.rc.in" "${CMAKE_BINARY_DIR}/lmms.rc") +CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/plugins/zynaddsubfx/zynaddsubfx.rc.in" "${CMAKE_BINARY_DIR}/plugins/zynaddsubfx/zynaddsubfx.rc") # set compiler flags SET(WERROR_FLAGS "-Wall -Werror -Werror=unused-function -Wno-sign-compare -Wno-strict-overflow") @@ -343,25 +343,25 @@ set(CMAKE_C_FLAGS_DEBUG "-DLMMS_DEBUG") # people simply updating git will still have this and mess up build with it FILE(REMOVE include/lmmsconfig.h) -FILE(GLOB lmms_INCLUDES ${CMAKE_SOURCE_DIR}/include/*.h) -FILE(GLOB lmms_UI ${CMAKE_SOURCE_DIR}/src/gui/dialogs/*.ui ${CMAKE_SOURCE_DIR}/src/gui/Forms/*.ui) -FILE(GLOB_RECURSE lmms_SOURCES ${CMAKE_SOURCE_DIR}/src/*.cpp) +FILE(GLOB lmms_INCLUDES "${CMAKE_SOURCE_DIR}/include/*.h") +FILE(GLOB lmms_UI "${CMAKE_SOURCE_DIR}/src/gui/dialogs/*.ui" "${CMAKE_SOURCE_DIR}/src/gui/Forms/*.ui") +FILE(GLOB_RECURSE lmms_SOURCES "${CMAKE_SOURCE_DIR}/src/*.cpp") SET(lmms_MOC ${lmms_INCLUDES}) # Get list of all committers from git history, ordered by number of commits FIND_PACKAGE(Git) IF(GIT_FOUND) - SET(CONTRIBUTORS ${CMAKE_BINARY_DIR}/CONTRIBUTORS) + SET(CONTRIBUTORS "${CMAKE_BINARY_DIR}/CONTRIBUTORS") EXECUTE_PROCESS( - COMMAND ${GIT_EXECUTABLE} shortlog -sne + COMMAND "${GIT_EXECUTABLE}" shortlog -sne COMMAND cut -c8- - OUTPUT_FILE ${CONTRIBUTORS} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + OUTPUT_FILE "${CONTRIBUTORS}" + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" TIMEOUT 1) ENDIF(GIT_FOUND) -SET(lmms_EMBEDDED_RESOURCES ${CMAKE_SOURCE_DIR}/AUTHORS ${CMAKE_SOURCE_DIR}/COPYING ${CONTRIBUTORS}) +SET(lmms_EMBEDDED_RESOURCES "${CMAKE_SOURCE_DIR}/AUTHORS" "${CMAKE_SOURCE_DIR}/COPYING" "${CONTRIBUTORS}") QT4_WRAP_CPP(lmms_MOC_out ${lmms_MOC} OPTIONS -nw) QT4_WRAP_UI(lmms_UI_out ${lmms_UI}) @@ -370,29 +370,29 @@ QT4_WRAP_UI(lmms_UI_out ${lmms_UI}) # embedded resources stuff IF(WIN32 OR WIN64) # compile buildtools native - SET(BIN2RES_CPP ${CMAKE_SOURCE_DIR}/buildtools/bin2res.cpp) - SET(BIN2RES ${CMAKE_BINARY_DIR}/bin2res) - ADD_CUSTOM_COMMAND(OUTPUT ${BIN2RES} COMMAND g++ ARGS ${BIN2RES_CPP} -o ${BIN2RES} DEPENDS ${BIN2RES_CPP}) + SET(BIN2RES_CPP "${CMAKE_SOURCE_DIR}/buildtools/bin2res.cpp") + SET(BIN2RES "${CMAKE_BINARY_DIR}/bin2res") + ADD_CUSTOM_COMMAND(OUTPUT "${BIN2RES}" COMMAND g++ ARGS "\"${BIN2RES_CPP}\"" -o "\"${BIN2RES}\"" DEPENDS "${BIN2RES_CPP}") ELSE(WIN32 OR WIN64) ADD_EXECUTABLE(bin2res buildtools/bin2res.cpp) GET_TARGET_PROPERTY(BIN2RES bin2res LOCATION) ENDIF(WIN32 OR WIN64) -SET(LMMS_ER_H ${CMAKE_CURRENT_BINARY_DIR}/embedded_resources.h) +SET(LMMS_ER_H "${CMAKE_CURRENT_BINARY_DIR}/embedded_resources.h") # we somehow have to make LMMS-binary depend on MOC-files -ADD_FILE_DEPENDENCIES(${CMAKE_BINARY_DIR}/lmmsconfig.h ${lmms_MOC_out}) +ADD_FILE_DEPENDENCIES("${CMAKE_BINARY_DIR}/lmmsconfig.h" ${lmms_MOC_out}) -ADD_CUSTOM_COMMAND(OUTPUT ${LMMS_ER_H} COMMAND ${BIN2RES} ARGS ${lmms_EMBEDDED_RESOURCES} > ${LMMS_ER_H} DEPENDS ${BIN2RES}) +ADD_CUSTOM_COMMAND(OUTPUT "${LMMS_ER_H}" COMMAND "${BIN2RES}" ARGS ${lmms_EMBEDDED_RESOURCES} > "\"${LMMS_ER_H}\"" DEPENDS "${BIN2RES}") IF(WIN32) SET(WINRC "${CMAKE_BINARY_DIR}/lmmsrc.obj") - ADD_CUSTOM_COMMAND(OUTPUT ${WINRC} - COMMAND ${WINDRES} - -I${CMAKE_SOURCE_DIR} - -o${CMAKE_BINARY_DIR}/lmmsrc.obj - -i${CMAKE_BINARY_DIR}/lmms.rc - DEPENDS ${CMAKE_BINARY_DIR}/lmms.rc) + ADD_CUSTOM_COMMAND(OUTPUT "${WINRC}" + COMMAND "${WINDRES}" + "-I\"${CMAKE_SOURCE_DIR}\"" + "-o\"${CMAKE_BINARY_DIR}/lmmsrc.obj\"" + "-i\"${CMAKE_BINARY_DIR}/lmms.rc\"" + DEPENDS "${CMAKE_BINARY_DIR}/lmms.rc") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-attributes") ELSE(WIN32) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -DPIC") @@ -413,42 +413,62 @@ IF(LMMS_BUILD_WIN32) ENDIF() # Paths relative to lmms executable -FILE(RELATIVE_PATH LIB_DIR_RELATIVE /${BIN_DIR} /${LIB_DIR}) -FILE(RELATIVE_PATH PLUGIN_DIR_RELATIVE /${BIN_DIR} /${PLUGIN_DIR}) +FILE(RELATIVE_PATH LIB_DIR_RELATIVE "/${BIN_DIR}" "/${LIB_DIR}") +FILE(RELATIVE_PATH PLUGIN_DIR_RELATIVE "/${BIN_DIR}" "/${PLUGIN_DIR}") ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR_RELATIVE}/"' -D'PLUGIN_DIR="${PLUGIN_DIR_RELATIVE}/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS}) +INCLUDE_DIRECTORIES("${CMAKE_BINARY_DIR}" + "${CMAKE_BINARY_DIR}/include" + "${CMAKE_SOURCE_DIR}" + "${CMAKE_SOURCE_DIR}/include" + ${JACK_INCLUDE_DIRS} + ${SAMPLERATE_INCLUDE_DIRS} + ${SNDFILE_INCLUDE_DIRS}) -INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ${SDL_INCLUDE_DIR} ${PORTAUDIO_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIR} ${JACK_INCLUDE_DIRS} ${OGGVORBIS_INCLUDE_DIR} ${SAMPLERATE_INCLUDE_DIRS} ${SNDFILE_INCLUDE_DIRS}) +IF(NOT ("${SDL_INCLUDE_DIR}" STREQUAL "")) + INCLUDE_DIRECTORIES("${SDL_INCLUDE_DIR}") +ENDIF() -ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_BINARY_DIR}/lmms.1.gz COMMAND gzip -c ${CMAKE_SOURCE_DIR}/lmms.1 > ${CMAKE_BINARY_DIR}/lmms.1.gz DEPENDS ${CMAKE_SOURCE_DIR}/lmms.1 COMMENT "Generating lmms.1.gz") +IF(NOT ("${PORTAUDIO_INCLUDE_DIR}" STREQUAL "")) + INCLUDE_DIRECTORIES("${PORTAUDIO_INCLUDE_DIR}") +ENDIF() -ADD_EXECUTABLE(lmms ${lmms_SOURCES} ${lmms_INCLUDES} ${LIBSAMPLERATE_SOURCES} ${LMMS_ER_H} ${lmms_UI_out} lmmsconfig.h lmmsversion.h ${WINRC} ${CMAKE_BINARY_DIR}/lmms.1.gz) +IF(NOT ("${PULSEAUDIO_INCLUDE_DIR}" STREQUAL "")) + INCLUDE_DIRECTORIES("${PULSEAUDIO_INCLUDE_DIR}") +ENDIF() + +IF(NOT ("${OGGVORBIS_INCLUDE_DIR}" STREQUAL "")) + INCLUDE_DIRECTORIES("${OGGVORBIS_INCLUDE_DIR}") +ENDIF() + +ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_BINARY_DIR}/lmms.1.gz" COMMAND gzip -c "\"${CMAKE_SOURCE_DIR}/lmms.1\"" > "\"${CMAKE_BINARY_DIR}/lmms.1.gz\"" DEPENDS "${CMAKE_SOURCE_DIR}/lmms.1" COMMENT "Generating lmms.1.gz") +ADD_EXECUTABLE(lmms ${lmms_SOURCES} ${lmms_INCLUDES} ${LIBSAMPLERATE_SOURCES} "${LMMS_ER_H}" ${lmms_UI_out} lmmsconfig.h lmmsversion.h "${WINRC}" "${CMAKE_BINARY_DIR}/lmms.1.gz") TARGET_LINK_LIBRARIES(lmms ${CMAKE_THREAD_LIBS_INIT} ${QT_LIBRARIES} ${ASOUND_LIBRARY} ${SDL_LIBRARY} ${PORTAUDIO_LIBRARIES} ${PULSEAUDIO_LIBRARIES} ${JACK_LIBRARIES} ${OGGVORBIS_LIBRARIES} ${SAMPLERATE_LIBRARIES} ${SNDFILE_LIBRARIES} ${EXTRA_LIBRARIES}) IF(LMMS_BUILD_WIN32) SET_TARGET_PROPERTIES(lmms PROPERTIES LINK_FLAGS "${LINK_FLAGS} -mwindows") - ADD_CUSTOM_COMMAND(TARGET lmms POST_BUILD COMMAND ${STRIP} ${CMAKE_BINARY_DIR}/lmms.exe) + ADD_CUSTOM_COMMAND(TARGET lmms POST_BUILD COMMAND "${STRIP}" "\"${CMAKE_BINARY_DIR}/lmms.exe\"") - INSTALL(TARGETS lmms RUNTIME DESTINATION ${BIN_DIR}) + INSTALL(TARGETS lmms RUNTIME DESTINATION "${BIN_DIR}") INSTALL(FILES - ${MINGW_PREFIX}/bin/QtCore4.dll - ${MINGW_PREFIX}/bin/QtGui4.dll - ${MINGW_PREFIX}/bin/QtXml4.dll - ${MINGW_PREFIX}/bin/libsndfile-1.dll - ${MINGW_PREFIX}/bin/libvorbis-0.dll - ${MINGW_PREFIX}/bin/libvorbisenc-2.dll - ${MINGW_PREFIX}/bin/libvorbisfile-3.dll - ${MINGW_PREFIX}/bin/libogg-0.dll - ${MINGW_PREFIX}/bin/libfluidsynth.dll - ${MINGW_PREFIX}/bin/libfftw3f-3.dll - ${MINGW_PREFIX}/bin/libFLAC-8.dll - ${MINGW_PREFIX}/bin/libportaudio-2.dll - ${MINGW_PREFIX}/bin/libpng15-15.dll - ${MINGW_PREFIX}/bin/SDL.dll - ${MINGW_PREFIX}/bin/libglib-2.0-0.dll - ${MINGW_PREFIX}/bin/libgthread-2.0-0.dll - ${MINGW_PREFIX}/bin/zlib1.dll + "${MINGW_PREFIX}/bin/QtCore4.dll" + "${MINGW_PREFIX}/bin/QtGui4.dll" + "${MINGW_PREFIX}/bin/QtXml4.dll" + "${MINGW_PREFIX}/bin/libsndfile-1.dll" + "${MINGW_PREFIX}/bin/libvorbis-0.dll" + "${MINGW_PREFIX}/bin/libvorbisenc-2.dll" + "${MINGW_PREFIX}/bin/libvorbisfile-3.dll" + "${MINGW_PREFIX}/bin/libogg-0.dll" + "${MINGW_PREFIX}/bin/libfluidsynth.dll" + "${MINGW_PREFIX}/bin/libfftw3f-3.dll" + "${MINGW_PREFIX}/bin/libFLAC-8.dll" + "${MINGW_PREFIX}/bin/libportaudio-2.dll" + "${MINGW_PREFIX}/bin/libpng15-15.dll" + "${MINGW_PREFIX}/bin/SDL.dll" + "${MINGW_PREFIX}/bin/libglib-2.0-0.dll" + "${MINGW_PREFIX}/bin/libgthread-2.0-0.dll" + "${MINGW_PREFIX}/bin/zlib1.dll" DESTINATION .) ELSE(LMMS_BUILD_WIN32) @@ -456,8 +476,8 @@ ELSE(LMMS_BUILD_WIN32) SET_TARGET_PROPERTIES(lmms PROPERTIES LINK_FLAGS "${LINK_FLAGS} -Wl,-E") ENDIF(NOT LMMS_BUILD_APPLE) - INSTALL(TARGETS lmms RUNTIME DESTINATION ${BIN_DIR}) - INSTALL(FILES ${CMAKE_BINARY_DIR}/lmms.1.gz DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1/ PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) + INSTALL(TARGETS lmms RUNTIME DESTINATION "${BIN_DIR}") + INSTALL(FILES "${CMAKE_BINARY_DIR}/lmms.1.gz" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1/" PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) ENDIF(LMMS_BUILD_WIN32) @@ -471,39 +491,47 @@ FOREACH(_ts_file ${lmms_LOCALES}) STRING(REPLACE "${CMAKE_SOURCE_DIR}/data/locale/" "" _ts_target "${_ts_file}") STRING(REPLACE ".ts" ".qm" _qm_file "${_ts_file}") STRING(REPLACE ".ts" ".qm" _qm_target "${_ts_target}") - ADD_CUSTOM_TARGET(${_ts_target} COMMAND ${QT_LUPDATE_EXECUTABLE} -locations none -no-obsolete ${lmms_SOURCES} ${lmms_UI} `find ${CMAKE_SOURCE_DIR}/plugins/ -type f -name '*.cpp'` -ts ${_ts_file}) - ADD_CUSTOM_TARGET(${_qm_target} COMMAND ${QT_LRELEASE_EXECUTABLE} ${_ts_file} -qm ${_qm_file}) + ADD_CUSTOM_TARGET(${_ts_target} COMMAND "${QT_LUPDATE_EXECUTABLE}" -locations none -no-obsolete ${lmms_SOURCES} ${lmms_UI} `find "\"${CMAKE_SOURCE_DIR}/plugins/\"" -type f -name '*.cpp'` -ts "\"${_ts_file}\"") + ADD_CUSTOM_TARGET(${_qm_target} COMMAND "${QT_LRELEASE_EXECUTABLE}" "\"${_ts_file}\"" -qm "\"${_qm_file}\"") LIST(APPEND ts_targets "${_ts_target}") LIST(APPEND qm_targets "${_qm_target}") ENDFOREACH(_ts_file ${lmms_LOCALES}) ADD_CUSTOM_TARGET(update-locales) FOREACH(_item ${ts_targets}) - ADD_DEPENDENCIES(update-locales ${_item}) + ADD_DEPENDENCIES(update-locales "${_item}") ENDFOREACH(_item ${ts_targets}) ADD_CUSTOM_TARGET(finalize-locales) FOREACH(_item ${qm_targets}) - ADD_DEPENDENCIES(finalize-locales ${_item}) + ADD_DEPENDENCIES(finalize-locales "${_item}") ENDFOREACH(_item ${qm_targets}) # install headers IF(LMMS_BUILD_LINUX) -INSTALL(FILES ${lmms_INCLUDES} ${CMAKE_BINARY_DIR}/lmmsconfig.h ${CMAKE_BINARY_DIR}/lmmsversion.h ${CMAKE_SOURCE_DIR}/src/gui/embed.cpp DESTINATION ${CMAKE_INSTALL_PREFIX}/include/lmms/) -IF(NOT LMMS_HAVE_SAMPLERATE) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate/samplerate.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/lmms/) -ENDIF(NOT LMMS_HAVE_SAMPLERATE) + INSTALL(FILES ${lmms_INCLUDES} + "${CMAKE_BINARY_DIR}/lmmsconfig.h" + "${CMAKE_BINARY_DIR}/lmmsversion.h" + "${CMAKE_SOURCE_DIR}/src/gui/embed.cpp" + DESTINATION "${CMAKE_INSTALL_PREFIX}/include/lmms/") + + IF(NOT LMMS_HAVE_SAMPLERATE) + INSTALL(FILES "${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate/samplerate.h" + DESTINATION "${CMAKE_INSTALL_PREFIX}/include/lmms/") + ENDIF(NOT LMMS_HAVE_SAMPLERATE) ENDIF(LMMS_BUILD_LINUX) # package ZynAddSubFX into win32 build IF(LMMS_BUILD_WIN32) -IF(EXISTS ${CMAKE_SOURCE_DIR}/extras) -ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/extras/data/presets) -FILE(GLOB ZASF_BINARIES ${CMAKE_SOURCE_DIR}/extras/plugins/zynaddsubfx/zynaddsubfx.dll ${CMAKE_SOURCE_DIR}/extras/plugins/zynaddsubfx/remote_zynaddsubfx.exe) -INSTALL(FILES ${ZASF_BINARIES} DESTINATION ${PLUGIN_DIR}) -ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/extras) + IF(EXISTS "${CMAKE_SOURCE_DIR}/extras") + ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/extras/data/presets") + FILE(GLOB ZASF_BINARIES + "${CMAKE_SOURCE_DIR}/extras/plugins/zynaddsubfx/zynaddsubfx.dll" + "${CMAKE_SOURCE_DIR}/extras/plugins/zynaddsubfx/remote_zynaddsubfx.exe") + INSTALL(FILES "${ZASF_BINARIES}" DESTINATION "${PLUGIN_DIR}") + ENDIF(EXISTS "${CMAKE_SOURCE_DIR}/extras") ENDIF(LMMS_BUILD_WIN32) # @@ -519,13 +547,13 @@ ADD_CUSTOM_TARGET(distclean SET(TMP "lmms-${VERSION}") ADD_CUSTOM_TARGET(dist COMMAND make clean - COMMAND rm -rf ${TMP} - COMMAND mkdir -p ${TMP} - COMMAND cp AUTHORS build_mingw32 build_mingw64 CMakeLists.txt configure COPYING INSTALL lmms.1 lmms.rc.in lmms.spec.in lmmsconfig.h.in lmmsversion.h.in README TODO ${TMP} - COMMAND cp -r buildtools cmake data include plugins src ${TMP} - COMMAND rm -rf `find ${TMP} -name cmake_install.cmake` `find ${TMP} -name Makefile` `find ${TMP} -type d -name CMakeFiles` ${TMP}/CMakeCache.txt - COMMAND tar cjf lmms-${VERSION}.tar.bz2 ${TMP} - COMMAND rm -rf ${TMP}) + COMMAND rm -rf "${TMP}" + COMMAND mkdir -p "${TMP}" + COMMAND cp AUTHORS build_mingw32 build_mingw64 CMakeLists.txt configure COPYING INSTALL lmms.1 lmms.rc.in lmms.spec.in lmmsconfig.h.in lmmsversion.h.in README TODO "${TMP}" + COMMAND cp -r buildtools cmake data include plugins src "${TMP}" + COMMAND rm -rf `find "${TMP}" -name cmake_install.cmake` `find "${TMP}" -name Makefile` `find "${TMP}" -type d -name CMakeFiles` "${TMP}/CMakeCache.txt" + COMMAND tar cjf lmms-${VERSION}.tar.bz2 "${TMP}" + COMMAND rm -rf "${TMP}") SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_ER_H} ${lmms_MOC_out} ${lmms_UI_out} lmmsconfig.h lmms.1.gz") @@ -595,8 +623,8 @@ INCLUDE(InstallRequiredSystemLibraries) SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "LMMS - easy music production for everyone!") SET(CPACK_PACKAGE_VENDOR "LMMS Developers") IF(LMMS_BUILD_APPLE) -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/README ${CMAKE_BINARY_DIR}/README.txt COPYONLY) -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/COPYING ${CMAKE_BINARY_DIR}/COPYING.txt COPYONLY) +CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/README" "${CMAKE_BINARY_DIR}/README.txt" COPYONLY) +CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/COPYING" "${CMAKE_BINARY_DIR}/COPYING.txt" COPYONLY) SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_BINARY_DIR}/README.txt") SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_BINARY_DIR}/COPYING.txt") ELSE(LMMS_BUILD_APPLE) diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index cdd6d8248..e385d2f13 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -6,14 +6,14 @@ ADD_SUBDIRECTORY(samples) ADD_SUBDIRECTORY(themes) IF(LMMS_BUILD_LINUX) -INSTALL(FILES themes/default/icon.png DESTINATION ${DATA_DIR}/pixmaps RENAME lmms.png) -INSTALL(FILES lmms DESTINATION ${DATA_DIR}/menu) -INSTALL(FILES lmms.desktop DESTINATION ${DATA_DIR}/applications) -INSTALL(FILES lmms.xml DESTINATION ${DATA_DIR}/mime/packages) + INSTALL(FILES themes/default/icon.png DESTINATION "${DATA_DIR}/pixmaps" RENAME lmms.png) + INSTALL(FILES lmms DESTINATION "${DATA_DIR}/menu") + INSTALL(FILES lmms.desktop DESTINATION "${DATA_DIR}/applications") + INSTALL(FILES lmms.xml DESTINATION "${DATA_DIR}/mime/packages") ENDIF(LMMS_BUILD_LINUX) IF(LMMS_BUILD_WIN32) -FILE(GLOB RAWWAVES ${CMAKE_INSTALL_PREFIX}/share/stk/rawwaves/*.raw) -INSTALL(FILES ${RAWWAVES} DESTINATION ${DATA_DIR}/stk/rawwaves) + FILE(GLOB RAWWAVES "${CMAKE_INSTALL_PREFIX}/share/stk/rawwaves/*.raw") + INSTALL(FILES ${RAWWAVES} DESTINATION "${DATA_DIR}/stk/rawwaves") ENDIF(LMMS_BUILD_WIN32) diff --git a/data/backgrounds/CMakeLists.txt b/data/backgrounds/CMakeLists.txt index d4d07ab49..e296bb357 100644 --- a/data/backgrounds/CMakeLists.txt +++ b/data/backgrounds/CMakeLists.txt @@ -1,2 +1,2 @@ FILE(GLOB PNG_FILES *.png) -INSTALL(FILES ${PNG_FILES} DESTINATION ${LMMS_DATA_DIR}/backgrounds) +INSTALL(FILES ${PNG_FILES} DESTINATION "${LMMS_DATA_DIR}/backgrounds") diff --git a/data/locale/CMakeLists.txt b/data/locale/CMakeLists.txt index e227db795..4aa7d9e2a 100644 --- a/data/locale/CMakeLists.txt +++ b/data/locale/CMakeLists.txt @@ -1,6 +1,7 @@ FILE(GLOB QM_FILES *.qm) IF(LMMS_BUILD_WIN32) - FILE(GLOB QT_QM_FILES ${QT_TRANSLATIONS_DIR}/qt*[^h].qm) + FILE(GLOB QT_QM_FILES "${QT_TRANSLATIONS_DIR}/qt*[^h].qm") ENDIF(LMMS_BUILD_WIN32) -INSTALL(FILES ${QM_FILES} ${QT_QM_FILES} DESTINATION ${LMMS_DATA_DIR}/locale) + +INSTALL(FILES ${QM_FILES} ${QT_QM_FILES} DESTINATION "${LMMS_DATA_DIR}/locale") diff --git a/plugins/audio_file_processor/CMakeLists.txt b/plugins/audio_file_processor/CMakeLists.txt index 848e6ed2f..089028c32 100644 --- a/plugins/audio_file_processor/CMakeLists.txt +++ b/plugins/audio_file_processor/CMakeLists.txt @@ -1,3 +1,3 @@ INCLUDE(BuildPlugin) -BUILD_PLUGIN(audiofileprocessor audio_file_processor.cpp audio_file_processor.h MOCFILES audio_file_processor.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) +BUILD_PLUGIN(audiofileprocessor audio_file_processor.cpp audio_file_processor.h MOCFILES audio_file_processor.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") diff --git a/plugins/bass_booster/CMakeLists.txt b/plugins/bass_booster/CMakeLists.txt index f8cab56cf..9f3f45acb 100644 --- a/plugins/bass_booster/CMakeLists.txt +++ b/plugins/bass_booster/CMakeLists.txt @@ -1,3 +1,3 @@ INCLUDE(BuildPlugin) -BUILD_PLUGIN(bassbooster bass_booster.cpp bassbooster_controls.cpp bassbooster_control_dialog.cpp MOCFILES bassbooster_controls.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) +BUILD_PLUGIN(bassbooster bass_booster.cpp bassbooster_controls.cpp bassbooster_control_dialog.cpp MOCFILES bassbooster_controls.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") diff --git a/plugins/bit_invader/CMakeLists.txt b/plugins/bit_invader/CMakeLists.txt index 786defdbe..4b0ffcba1 100644 --- a/plugins/bit_invader/CMakeLists.txt +++ b/plugins/bit_invader/CMakeLists.txt @@ -1,3 +1,3 @@ INCLUDE(BuildPlugin) -BUILD_PLUGIN(bitinvader bit_invader.cpp bit_invader.h MOCFILES bit_invader.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) +BUILD_PLUGIN(bitinvader bit_invader.cpp bit_invader.h MOCFILES bit_invader.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") diff --git a/plugins/kicker/CMakeLists.txt b/plugins/kicker/CMakeLists.txt index a9e40931f..d2990639d 100644 --- a/plugins/kicker/CMakeLists.txt +++ b/plugins/kicker/CMakeLists.txt @@ -1,3 +1,3 @@ INCLUDE(BuildPlugin) -BUILD_PLUGIN(kicker kicker.cpp kicker.h MOCFILES kicker.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) +BUILD_PLUGIN(kicker kicker.cpp kicker.h MOCFILES kicker.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") diff --git a/plugins/ladspa_browser/CMakeLists.txt b/plugins/ladspa_browser/CMakeLists.txt index 30ee8268c..5da7194ed 100644 --- a/plugins/ladspa_browser/CMakeLists.txt +++ b/plugins/ladspa_browser/CMakeLists.txt @@ -1,3 +1,3 @@ INCLUDE(BuildPlugin) -BUILD_PLUGIN(ladspabrowser ladspa_browser.cpp ladspa_browser.h ladspa_description.cpp ladspa_description.h ladspa_port_dialog.cpp ladspa_port_dialog.h MOCFILES ladspa_browser.h ladspa_description.h ladspa_port_dialog.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) +BUILD_PLUGIN(ladspabrowser ladspa_browser.cpp ladspa_browser.h ladspa_description.cpp ladspa_description.h ladspa_port_dialog.cpp ladspa_port_dialog.h MOCFILES ladspa_browser.h ladspa_description.h ladspa_port_dialog.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") diff --git a/plugins/ladspa_effect/CMakeLists.txt b/plugins/ladspa_effect/CMakeLists.txt index fe5897787..80802ec35 100644 --- a/plugins/ladspa_effect/CMakeLists.txt +++ b/plugins/ladspa_effect/CMakeLists.txt @@ -21,6 +21,6 @@ ENDIF(WANT_CALF) INCLUDE(BuildPlugin) -BUILD_PLUGIN(ladspaeffect LadspaEffect.cpp LadspaControls.cpp LadspaControlDialog.cpp LadspaSubPluginFeatures.cpp LadspaEffect.h LadspaControls.h LadspaControlDialog.h LadspaSubPluginFeatures.h MOCFILES LadspaEffect.h LadspaControls.h LadspaControlDialog.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) +BUILD_PLUGIN(ladspaeffect LadspaEffect.cpp LadspaControls.cpp LadspaControlDialog.cpp LadspaSubPluginFeatures.cpp LadspaEffect.h LadspaControls.h LadspaControlDialog.h LadspaSubPluginFeatures.h MOCFILES LadspaEffect.h LadspaControls.h LadspaControlDialog.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") diff --git a/plugins/ladspa_effect/calf/CMakeLists.txt b/plugins/ladspa_effect/calf/CMakeLists.txt index f72f1f2a7..9d766736d 100644 --- a/plugins/ladspa_effect/calf/CMakeLists.txt +++ b/plugins/ladspa_effect/calf/CMakeLists.txt @@ -1,7 +1,10 @@ -FILE(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) +FILE(GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") ADD_LIBRARY(calf MODULE ${SOURCES}) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src) -INSTALL(TARGETS calf LIBRARY DESTINATION ${PLUGIN_DIR}/ladspa) +INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include" + "${CMAKE_BINARY_DIR}" + "${CMAKE_CURRENT_SOURCE_DIR}" + "${CMAKE_CURRENT_SOURCE_DIR}/src") +INSTALL(TARGETS calf LIBRARY DESTINATION "${PLUGIN_DIR}/ladspa") SET_TARGET_PROPERTIES(calf PROPERTIES PREFIX "") SET(INLINE_FLAGS "") IF(NOT LMMS_BUILD_APPLE) @@ -10,7 +13,7 @@ ENDIF(NOT LMMS_BUILD_APPLE) SET_TARGET_PROPERTIES(calf PROPERTIES COMPILE_FLAGS "-O2 -finline-limit=80 -finline-functions ${INLINE_FLAGS}") IF(LMMS_BUILD_WIN32) - ADD_CUSTOM_COMMAND(TARGET calf POST_BUILD COMMAND ${STRIP} ${CMAKE_CURRENT_BINARY_DIR}/calf.dll) + ADD_CUSTOM_COMMAND(TARGET calf POST_BUILD COMMAND "${STRIP}" "\"${CMAKE_CURRENT_BINARY_DIR}/calf.dll\"") ENDIF(LMMS_BUILD_WIN32) IF(NOT LMMS_BUILD_APPLE) SET_TARGET_PROPERTIES(calf PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined") diff --git a/plugins/ladspa_effect/caps/CMakeLists.txt b/plugins/ladspa_effect/caps/CMakeLists.txt index 85d12b546..4576a5c4a 100644 --- a/plugins/ladspa_effect/caps/CMakeLists.txt +++ b/plugins/ladspa_effect/caps/CMakeLists.txt @@ -1,7 +1,7 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include") FILE(GLOB SOURCES *.cc) ADD_LIBRARY(caps MODULE ${SOURCES}) -INSTALL(TARGETS caps LIBRARY DESTINATION ${PLUGIN_DIR}/ladspa) +INSTALL(TARGETS caps LIBRARY DESTINATION "${PLUGIN_DIR}/ladspa") IF(LMMS_BUILD_WIN64) ADD_DEFINITIONS(-DLMMS_BUILD_WIN64) ENDIF(LMMS_BUILD_WIN64) @@ -9,7 +9,7 @@ SET_TARGET_PROPERTIES(caps PROPERTIES PREFIX "") SET_TARGET_PROPERTIES(caps PROPERTIES COMPILE_FLAGS "-O2 -funroll-loops -Wno-write-strings") IF(LMMS_BUILD_WIN32) - ADD_CUSTOM_COMMAND(TARGET caps POST_BUILD COMMAND ${STRIP} ${CMAKE_CURRENT_BINARY_DIR}/caps.dll) + ADD_CUSTOM_COMMAND(TARGET caps POST_BUILD COMMAND "${STRIP}" "\"${CMAKE_CURRENT_BINARY_DIR}/caps.dll\"") ENDIF(LMMS_BUILD_WIN32) IF(NOT LMMS_BUILD_APPLE) SET_TARGET_PROPERTIES(caps PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined") diff --git a/plugins/ladspa_effect/cmt/CMakeLists.txt b/plugins/ladspa_effect/cmt/CMakeLists.txt index 3bd7cc229..382bfc4c4 100644 --- a/plugins/ladspa_effect/cmt/CMakeLists.txt +++ b/plugins/ladspa_effect/cmt/CMakeLists.txt @@ -1,13 +1,13 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include") FILE(GLOB_RECURSE SOURCES src/*.cpp) ADD_LIBRARY(cmt MODULE ${SOURCES}) -INSTALL(TARGETS cmt LIBRARY DESTINATION ${PLUGIN_DIR}/ladspa) +INSTALL(TARGETS cmt LIBRARY DESTINATION "${PLUGIN_DIR}/ladspa") SET_TARGET_PROPERTIES(cmt PROPERTIES PREFIX "") SET_TARGET_PROPERTIES(cmt PROPERTIES COMPILE_FLAGS "-Wall -O3 -fno-strict-aliasing") IF(LMMS_BUILD_WIN32) - ADD_CUSTOM_COMMAND(TARGET cmt POST_BUILD COMMAND ${STRIP} ${CMAKE_CURRENT_BINARY_DIR}/cmt.dll) + ADD_CUSTOM_COMMAND(TARGET cmt POST_BUILD COMMAND "${STRIP}" "\"${CMAKE_CURRENT_BINARY_DIR}/cmt.dll\"") ELSE(LMMS_BUILD_WIN32) SET_TARGET_PROPERTIES(cmt PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -fPIC") ENDIF(LMMS_BUILD_WIN32) diff --git a/plugins/ladspa_effect/swh/CMakeLists.txt b/plugins/ladspa_effect/swh/CMakeLists.txt index 5a3e3d0e4..080f446e0 100644 --- a/plugins/ladspa_effect/swh/CMakeLists.txt +++ b/plugins/ladspa_effect/swh/CMakeLists.txt @@ -1,30 +1,31 @@ -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}) - ADD_DEFINITIONS(-DFFTW3) -INCLUDE_DIRECTORIES(${FFTW3F_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}) +INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include" + "${CMAKE_CURRENT_SOURCE_DIR}" + ${FFTW3F_INCLUDE_DIRS} + "${CMAKE_BINARY_DIR}") LINK_DIRECTORIES(${FFTW3F_LIBRARY_DIRS}) LINK_LIBRARIES(-lfftw3f) +FILE(GLOB PLUGIN_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.c") -FILE(GLOB PLUGIN_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.c) FOREACH(_item ${PLUGIN_SOURCES}) GET_FILENAME_COMPONENT(_plugin "${_item}" NAME_WE) - ADD_LIBRARY(${_plugin} MODULE ${_item}) - INSTALL(TARGETS ${_plugin} LIBRARY DESTINATION ${PLUGIN_DIR}/ladspa) - SET_TARGET_PROPERTIES(${_plugin} PROPERTIES PREFIX "") - SET_TARGET_PROPERTIES(${_plugin} PROPERTIES COMPILE_FLAGS "-O3 -Wall -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -c -fno-strict-aliasing") + ADD_LIBRARY("${_plugin}" MODULE "${_item}") + INSTALL(TARGETS "${_plugin}" LIBRARY DESTINATION "${PLUGIN_DIR}/ladspa") + SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES PREFIX "") + SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES COMPILE_FLAGS "-O3 -Wall -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -c -fno-strict-aliasing") IF(LMMS_BUILD_WIN32) - ADD_CUSTOM_COMMAND(TARGET ${_plugin} POST_BUILD COMMAND ${STRIP} ${CMAKE_CURRENT_BINARY_DIR}/${_plugin}.dll) + ADD_CUSTOM_COMMAND(TARGET "${_plugin}" POST_BUILD COMMAND "${STRIP}" "\"${CMAKE_CURRENT_BINARY_DIR}/${_plugin}.dll\"") ELSE(LMMS_BUILD_WIN32) - SET_TARGET_PROPERTIES(${_plugin} PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -fPIC -DPIC") + SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -fPIC -DPIC") ENDIF(LMMS_BUILD_WIN32) IF(LMMS_BUILD_APPLE) - SET_TARGET_PROPERTIES(${_plugin} PROPERTIES LINK_FLAGS "${LINK_FLAGS} -Bsymbolic -lm") + SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES LINK_FLAGS "${LINK_FLAGS} -Bsymbolic -lm") ELSE(LMMS_BUILD_APPLE) - SET_TARGET_PROPERTIES(${_plugin} PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined -Wl,-Bsymbolic -lm") + SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined -Wl,-Bsymbolic -lm") ENDIF(LMMS_BUILD_APPLE) IF(LMMS_BUILD_LINUX) - SET_TARGET_PROPERTIES(${_plugin} PROPERTIES LINK_FLAGS "${LINK_FLAGS} -nostartfiles") + SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES LINK_FLAGS "${LINK_FLAGS} -nostartfiles") ENDIF(LMMS_BUILD_LINUX) ENDFOREACH(_item ${PLUGIN_SOURCES}) @@ -44,7 +45,7 @@ TARGET_LINK_LIBRARIES(highpass_iir_1890 iir) TARGET_LINK_LIBRARIES(lowpass_iir_1891 iir) TARGET_LINK_LIBRARIES(notch_iir_1894 iir) -FILE(GLOB GSM_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/gsm/*.c) +FILE(GLOB GSM_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/gsm/*.c") ADD_LIBRARY(gsm STATIC ${GSM_SOURCES}) SET_TARGET_PROPERTIES(gsm PROPERTIES COMPILE_FLAGS "${PIC_FLAGS}") TARGET_LINK_LIBRARIES(gsm_1215 gsm) diff --git a/plugins/ladspa_effect/tap/CMakeLists.txt b/plugins/ladspa_effect/tap/CMakeLists.txt index 12253fcf6..d88c6990b 100644 --- a/plugins/ladspa_effect/tap/CMakeLists.txt +++ b/plugins/ladspa_effect/tap/CMakeLists.txt @@ -3,19 +3,19 @@ FILE(GLOB PLUGIN_SOURCES *.c) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -Wno-write-strings -fomit-frame-pointer -fno-strict-aliasing -fstrength-reduce -funroll-loops -ffast-math") FOREACH(_item ${PLUGIN_SOURCES}) GET_FILENAME_COMPONENT(_plugin "${_item}" NAME_WE) - ADD_LIBRARY(${_plugin} MODULE ${_item}) - INSTALL(TARGETS ${_plugin} LIBRARY DESTINATION ${PLUGIN_DIR}/ladspa) - SET_TARGET_PROPERTIES(${_plugin} PROPERTIES PREFIX "") + ADD_LIBRARY("${_plugin}" MODULE "${_item}") + INSTALL(TARGETS "${_plugin}" LIBRARY DESTINATION "${PLUGIN_DIR}/ladspa") + SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES PREFIX "") IF(LMMS_BUILD_WIN32) - ADD_CUSTOM_COMMAND(TARGET ${_plugin} POST_BUILD COMMAND ${STRIP} ${CMAKE_CURRENT_BINARY_DIR}/${_plugin}.dll) + ADD_CUSTOM_COMMAND(TARGET "${_plugin}" POST_BUILD COMMAND "${STRIP}" "\"${CMAKE_CURRENT_BINARY_DIR}/${_plugin}.dll\"") ENDIF(LMMS_BUILD_WIN32) IF(LMMS_BUILD_APPLE) - SET_TARGET_PROPERTIES(${_plugin} PROPERTIES LINK_FLAGS "${LINK_FLAGS} -Bsymbolic -lm") + SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES LINK_FLAGS "${LINK_FLAGS} -Bsymbolic -lm") ELSE(LMMS_BUILD_APPLE) - SET_TARGET_PROPERTIES(${_plugin} PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined -Wl,-Bsymbolic -lm") + SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined -Wl,-Bsymbolic -lm") ENDIF(LMMS_BUILD_APPLE) IF(LMMS_BUILD_LINUX) - SET_TARGET_PROPERTIES(${_plugin} PROPERTIES LINK_FLAGS "${LINK_FLAGS} -nostartfiles") + SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES LINK_FLAGS "${LINK_FLAGS} -nostartfiles") ENDIF(LMMS_BUILD_LINUX) ENDFOREACH(_item ${PLUGIN_SOURCES}) diff --git a/plugins/lb302/CMakeLists.txt b/plugins/lb302/CMakeLists.txt index 0a0c5f80f..c9389eb18 100644 --- a/plugins/lb302/CMakeLists.txt +++ b/plugins/lb302/CMakeLists.txt @@ -1,3 +1,3 @@ INCLUDE(BuildPlugin) -BUILD_PLUGIN(lb302 lb302.cpp lb302.h MOCFILES lb302.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) +BUILD_PLUGIN(lb302 lb302.cpp lb302.h MOCFILES lb302.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") diff --git a/plugins/lb303/CMakeLists.txt b/plugins/lb303/CMakeLists.txt index 69d3bb23d..c5dd672e3 100644 --- a/plugins/lb303/CMakeLists.txt +++ b/plugins/lb303/CMakeLists.txt @@ -1,3 +1,3 @@ INCLUDE(BuildPlugin) -BUILD_PLUGIN(lb303 lb303.cpp lb303.h MOCFILES lb303.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) +BUILD_PLUGIN(lb303 lb303.cpp lb303.h MOCFILES lb303.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") diff --git a/plugins/opl2/CMakeLists.txt b/plugins/opl2/CMakeLists.txt index 981ec53a3..c12530af8 100644 --- a/plugins/opl2/CMakeLists.txt +++ b/plugins/opl2/CMakeLists.txt @@ -1,3 +1,3 @@ INCLUDE(BuildPlugin) -BUILD_PLUGIN(OPL2 opl2instrument.cpp opl2instrument.h opl.h fmopl.c fmopl.h temuopl.cpp temuopl.h MOCFILES opl2instrument.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) \ No newline at end of file +BUILD_PLUGIN(OPL2 opl2instrument.cpp opl2instrument.h opl.h fmopl.c fmopl.h temuopl.cpp temuopl.h MOCFILES opl2instrument.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") diff --git a/plugins/organic/CMakeLists.txt b/plugins/organic/CMakeLists.txt index fadbde92d..8eb0db7c8 100644 --- a/plugins/organic/CMakeLists.txt +++ b/plugins/organic/CMakeLists.txt @@ -1,3 +1,3 @@ INCLUDE(BuildPlugin) -BUILD_PLUGIN(organic organic.cpp organic.h MOCFILES organic.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) +BUILD_PLUGIN(organic organic.cpp organic.h MOCFILES organic.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") diff --git a/plugins/papu/CMakeLists.txt b/plugins/papu/CMakeLists.txt index 3f458f86c..30ae0aa8e 100644 --- a/plugins/papu/CMakeLists.txt +++ b/plugins/papu/CMakeLists.txt @@ -1,3 +1,3 @@ INCLUDE(BuildPlugin) -BUILD_PLUGIN(papu papu_instrument.cpp papu_instrument.h Basic_Gb_Apu.cpp Basic_Gb_Apu.h gb_apu/Gb_Oscs.cpp gb_apu/Gb_Apu.h gb_apu/Blip_Buffer.cpp gb_apu/Gb_Apu.cpp gb_apu/Gb_Oscs.h gb_apu/blargg_common.h gb_apu/Blip_Buffer.h gb_apu/Multi_Buffer.cpp gb_apu/blargg_source.h gb_apu/Blip_Synth.h gb_apu/Multi_Buffer.h MOCFILES papu_instrument.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) +BUILD_PLUGIN(papu papu_instrument.cpp papu_instrument.h Basic_Gb_Apu.cpp Basic_Gb_Apu.h gb_apu/Gb_Oscs.cpp gb_apu/Gb_Apu.h gb_apu/Blip_Buffer.cpp gb_apu/Gb_Apu.cpp gb_apu/Gb_Oscs.h gb_apu/blargg_common.h gb_apu/Blip_Buffer.h gb_apu/Multi_Buffer.cpp gb_apu/blargg_source.h gb_apu/Blip_Synth.h gb_apu/Multi_Buffer.h MOCFILES papu_instrument.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") diff --git a/plugins/patman/CMakeLists.txt b/plugins/patman/CMakeLists.txt index dc563b89e..38132ae22 100644 --- a/plugins/patman/CMakeLists.txt +++ b/plugins/patman/CMakeLists.txt @@ -1,3 +1,3 @@ INCLUDE(BuildPlugin) -BUILD_PLUGIN(patman patman.cpp patman.h MOCFILES patman.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) +BUILD_PLUGIN(patman patman.cpp patman.h MOCFILES patman.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") diff --git a/plugins/peak_controller_effect/CMakeLists.txt b/plugins/peak_controller_effect/CMakeLists.txt index 1a33dad4b..6904d079b 100644 --- a/plugins/peak_controller_effect/CMakeLists.txt +++ b/plugins/peak_controller_effect/CMakeLists.txt @@ -1,3 +1,3 @@ INCLUDE(BuildPlugin) -BUILD_PLUGIN(peakcontrollereffect peak_controller_effect.cpp peak_controller_effect_controls.cpp peak_controller_effect_control_dialog.cpp peak_controller_effect.h peak_controller_effect_controls.h peak_controller_effect_control_dialog.h MOCFILES peak_controller_effect_controls.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) +BUILD_PLUGIN(peakcontrollereffect peak_controller_effect.cpp peak_controller_effect_controls.cpp peak_controller_effect_control_dialog.cpp peak_controller_effect.h peak_controller_effect_controls.h peak_controller_effect_control_dialog.h MOCFILES peak_controller_effect_controls.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") diff --git a/plugins/sf2_player/CMakeLists.txt b/plugins/sf2_player/CMakeLists.txt index 15e6d7c23..110a2d157 100644 --- a/plugins/sf2_player/CMakeLists.txt +++ b/plugins/sf2_player/CMakeLists.txt @@ -3,6 +3,6 @@ if(LMMS_HAVE_FLUIDSYNTH) INCLUDE_DIRECTORIES(${FLUIDSYNTH_INCLUDE_DIRS}) LINK_DIRECTORIES(${FLUIDSYNTH_LIBRARY_DIRS}) LINK_LIBRARIES(${FLUIDSYNTH_LIBRARIES}) - BUILD_PLUGIN(sf2player sf2_player.cpp sf2_player.h patches_dialog.cpp patches_dialog.h patches_dialog.ui MOCFILES sf2_player.h patches_dialog.h UICFILES patches_dialog.ui EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) + BUILD_PLUGIN(sf2player sf2_player.cpp sf2_player.h patches_dialog.cpp patches_dialog.h patches_dialog.ui MOCFILES sf2_player.h patches_dialog.h UICFILES patches_dialog.ui EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") endif(LMMS_HAVE_FLUIDSYNTH) diff --git a/plugins/sfxr/CMakeLists.txt b/plugins/sfxr/CMakeLists.txt index 2fe490d1e..97f6dd88d 100644 --- a/plugins/sfxr/CMakeLists.txt +++ b/plugins/sfxr/CMakeLists.txt @@ -1,3 +1,3 @@ INCLUDE(BuildPlugin) -BUILD_PLUGIN(sfxr sfxr.cpp sfxr.h MOCFILES sfxr.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) +BUILD_PLUGIN(sfxr sfxr.cpp sfxr.h MOCFILES sfxr.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") diff --git a/plugins/sid/CMakeLists.txt b/plugins/sid/CMakeLists.txt index 41c11a0a0..387604bd4 100644 --- a/plugins/sid/CMakeLists.txt +++ b/plugins/sid/CMakeLists.txt @@ -1,5 +1,5 @@ INCLUDE(BuildPlugin) -BUILD_PLUGIN(sid sid_instrument.cpp sid_instrument.h envelope.h extfilt.h filter.h pot.h siddefs.h sid.h spline.h voice.h wave.h envelope.cc extfilt.cc filter.cc pot.cc sid.cc version.cc voice.cc wave6581_PS_.cc wave6581_PST.cc wave6581_P_T.cc wave6581__ST.cc wave8580_PS_.cc wave8580_PST.cc wave8580_P_T.cc wave8580__ST.cc wave.cc MOCFILES sid_instrument.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) +BUILD_PLUGIN(sid sid_instrument.cpp sid_instrument.h envelope.h extfilt.h filter.h pot.h siddefs.h sid.h spline.h voice.h wave.h envelope.cc extfilt.cc filter.cc pot.cc sid.cc version.cc voice.cc wave6581_PS_.cc wave6581_PST.cc wave6581_P_T.cc wave6581__ST.cc wave8580_PS_.cc wave8580_PST.cc wave8580_P_T.cc wave8580__ST.cc wave.cc MOCFILES sid_instrument.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") diff --git a/plugins/spectrum_analyzer/CMakeLists.txt b/plugins/spectrum_analyzer/CMakeLists.txt index 0863c481e..641741419 100644 --- a/plugins/spectrum_analyzer/CMakeLists.txt +++ b/plugins/spectrum_analyzer/CMakeLists.txt @@ -2,4 +2,4 @@ INCLUDE(BuildPlugin) INCLUDE_DIRECTORIES(${FFTW3F_INCLUDE_DIRS}) LINK_DIRECTORIES(${FFTW3F_LIBRARY_DIRS}) LINK_LIBRARIES(${FFTW3F_LIBRARIES}) -BUILD_PLUGIN(spectrumanalyzer spectrum_analyzer.cpp spectrumanalyzer_controls.cpp spectrumanalyzer_control_dialog.cpp spectrum_analyzer.h spectrumanalyzer_controls.h spectrumanalyzer_control_dialog.h MOCFILES spectrumanalyzer_controls.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) +BUILD_PLUGIN(spectrumanalyzer spectrum_analyzer.cpp spectrumanalyzer_controls.cpp spectrumanalyzer_control_dialog.cpp spectrum_analyzer.h spectrumanalyzer_controls.h spectrumanalyzer_control_dialog.h MOCFILES spectrumanalyzer_controls.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") diff --git a/plugins/stereo_enhancer/CMakeLists.txt b/plugins/stereo_enhancer/CMakeLists.txt index cca8ab9a5..fdd86dbd6 100644 --- a/plugins/stereo_enhancer/CMakeLists.txt +++ b/plugins/stereo_enhancer/CMakeLists.txt @@ -1,4 +1,4 @@ INCLUDE(BuildPlugin) -BUILD_PLUGIN(stereoenhancer stereo_enhancer.cpp stereoenhancer_controls.cpp stereoenhancer_control_dialog.cpp stereo_enhancer.h stereoenhancer_controls.h stereoenhancer_control_dialog.h MOCFILES stereoenhancer_controls.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) +BUILD_PLUGIN(stereoenhancer stereo_enhancer.cpp stereoenhancer_controls.cpp stereoenhancer_control_dialog.cpp stereo_enhancer.h stereoenhancer_controls.h stereoenhancer_control_dialog.h MOCFILES stereoenhancer_controls.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") diff --git a/plugins/stereo_matrix/CMakeLists.txt b/plugins/stereo_matrix/CMakeLists.txt index 7dee06eaf..176bd9771 100644 --- a/plugins/stereo_matrix/CMakeLists.txt +++ b/plugins/stereo_matrix/CMakeLists.txt @@ -1,4 +1,4 @@ INCLUDE(BuildPlugin) -BUILD_PLUGIN(stereomatrix stereo_matrix.cpp stereomatrix_controls.cpp stereomatrix_control_dialog.cpp stereo_matrix.h stereomatrix_controls.h stereomatrix_control_dialog.h MOCFILES stereomatrix_controls.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) +BUILD_PLUGIN(stereomatrix stereo_matrix.cpp stereomatrix_controls.cpp stereomatrix_control_dialog.cpp stereo_matrix.h stereomatrix_controls.h stereomatrix_control_dialog.h MOCFILES stereomatrix_controls.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") diff --git a/plugins/stk/mallets/CMakeLists.txt b/plugins/stk/mallets/CMakeLists.txt index d25973ddb..5be9cd144 100644 --- a/plugins/stk/mallets/CMakeLists.txt +++ b/plugins/stk/mallets/CMakeLists.txt @@ -1,5 +1,5 @@ INCLUDE(BuildPlugin) -INCLUDE_DIRECTORIES(${STK_INCLUDE_DIR}) +INCLUDE_DIRECTORIES("${STK_INCLUDE_DIR}") LINK_LIBRARIES(${STK_LIBRARY}) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions") -BUILD_PLUGIN(malletsstk mallets.cpp mallets.h MOCFILES mallets.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) +BUILD_PLUGIN(malletsstk mallets.cpp mallets.h MOCFILES mallets.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") diff --git a/plugins/vestige/CMakeLists.txt b/plugins/vestige/CMakeLists.txt index 2e459c36d..edf85da32 100644 --- a/plugins/vestige/CMakeLists.txt +++ b/plugins/vestige/CMakeLists.txt @@ -1,11 +1,8 @@ IF(LMMS_SUPPORT_VST) -INCLUDE(BuildPlugin) - -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../vst_base) -LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../vst_base) -LINK_LIBRARIES(vstbase) - -BUILD_PLUGIN(vestige vestige.cpp vestige.h MOCFILES vestige.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) - + INCLUDE(BuildPlugin) + INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../vst_base") + LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/../vst_base") + LINK_LIBRARIES(vstbase) + BUILD_PLUGIN(vestige vestige.cpp vestige.h MOCFILES vestige.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") ENDIF(LMMS_SUPPORT_VST) diff --git a/plugins/vibed/CMakeLists.txt b/plugins/vibed/CMakeLists.txt index 397e9a624..c092e874e 100644 --- a/plugins/vibed/CMakeLists.txt +++ b/plugins/vibed/CMakeLists.txt @@ -1,3 +1,3 @@ INCLUDE(BuildPlugin) -BUILD_PLUGIN(vibedstrings vibed.cpp nine_button_selector.cpp string_container.cpp vibrating_string.cpp vibed.h nine_button_selector.h string_container.h vibrating_string.h MOCFILES vibed.h nine_button_selector.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) +BUILD_PLUGIN(vibedstrings vibed.cpp nine_button_selector.cpp string_container.cpp vibrating_string.cpp vibed.h nine_button_selector.h string_container.h vibrating_string.h MOCFILES vibed.h nine_button_selector.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") diff --git a/plugins/vst_base/CMakeLists.txt b/plugins/vst_base/CMakeLists.txt index 313b3a2d5..a313ccdba 100644 --- a/plugins/vst_base/CMakeLists.txt +++ b/plugins/vst_base/CMakeLists.txt @@ -4,11 +4,11 @@ INCLUDE(BuildPlugin) IF(LMMS_BUILD_WIN32) ADD_DEFINITIONS(-DPTW32_STATIC_LIB) - ADD_EXECUTABLE(RemoteVstPlugin ${CMAKE_CURRENT_SOURCE_DIR}/RemoteVstPlugin.cpp) + ADD_EXECUTABLE(RemoteVstPlugin "${CMAKE_CURRENT_SOURCE_DIR}/RemoteVstPlugin.cpp") TARGET_LINK_LIBRARIES(RemoteVstPlugin -lQtCore4 -lpthread -lgdi32 -lws2_32) SET_TARGET_PROPERTIES(RemoteVstPlugin PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -O3") - ADD_CUSTOM_COMMAND(TARGET RemoteVstPlugin POST_BUILD COMMAND ${STRIP} ${CMAKE_CURRENT_BINARY_DIR}/RemoteVstPlugin.exe) - INSTALL(TARGETS RemoteVstPlugin RUNTIME DESTINATION ${PLUGIN_DIR}) + ADD_CUSTOM_COMMAND(TARGET RemoteVstPlugin POST_BUILD COMMAND "${STRIP}" "${CMAKE_CURRENT_BINARY_DIR}/RemoteVstPlugin.exe") + INSTALL(TARGETS RemoteVstPlugin RUNTIME DESTINATION "${PLUGIN_DIR}") IF(LMMS_BUILD_WIN64) # build 32 bit version of RemoteVstPlugin for Win64 so we can load @@ -33,18 +33,16 @@ IF(LMMS_HOST_X86_64) ENDIF(LMMS_HOST_X86_64) ADD_CUSTOM_COMMAND( - SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/RemoteVstPlugin.cpp + SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/RemoteVstPlugin.cpp" COMMAND wineg++ - ARGS -I${CMAKE_BINARY_DIR} -I${CMAKE_SOURCE_DIR}/include -I${CMAKE_INSTALL_PREFIX}/include/wine/windows -I${CMAKE_INSTALL_PREFIX}/include -I/usr/include/wine/windows ${CMAKE_CURRENT_SOURCE_DIR}/RemoteVstPlugin.cpp -mwindows -lpthread ${EXTRA_FLAGS} -o RemoteVstPlugin + ARGS "-I\"${CMAKE_BINARY_DIR}\"" "-I\"${CMAKE_SOURCE_DIR}/include\"" "-I\"${CMAKE_INSTALL_PREFIX}/include/wine/windows\"" "-I\"${CMAKE_INSTALL_PREFIX}/include\"" -I/usr/include/wine/windows "\"${CMAKE_CURRENT_SOURCE_DIR}/RemoteVstPlugin.cpp\"" -mwindows -lpthread ${EXTRA_FLAGS} -o RemoteVstPlugin COMMAND find -name RemoteVstPlugin.exe -exec mv "'{}'" RemoteVstPlugin "';'" TARGET vstbase OUTPUTS RemoteVstPlugin ) SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES RemoteVstPlugin.exe.so) - -INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/RemoteVstPlugin ${CMAKE_CURRENT_BINARY_DIR}/RemoteVstPlugin.exe.so DESTINATION ${PLUGIN_DIR}) - +INSTALL(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/RemoteVstPlugin" "${CMAKE_CURRENT_BINARY_DIR}/RemoteVstPlugin.exe.so" DESTINATION "${PLUGIN_DIR}") ENDIF(LMMS_BUILD_LINUX AND NOT WANT_VST_NOWINE) diff --git a/plugins/vst_base/Win64/CMakeLists.txt b/plugins/vst_base/Win64/CMakeLists.txt index 3f151e363..486f41f27 100644 --- a/plugins/vst_base/Win64/CMakeLists.txt +++ b/plugins/vst_base/Win64/CMakeLists.txt @@ -1,16 +1,13 @@ -INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/include) +INCLUDE_DIRECTORIES("${CMAKE_BINARY_DIR}" "${CMAKE_SOURCE_DIR}/include") SET(CMAKE_CXX_COMPILER "${CMAKE_CXX_COMPILER32}") -ADD_EXECUTABLE(RemoteVstPlugin32 ${CMAKE_CURRENT_SOURCE_DIR}/../RemoteVstPlugin.cpp) +ADD_EXECUTABLE(RemoteVstPlugin32 "${CMAKE_CURRENT_SOURCE_DIR}/../RemoteVstPlugin.cpp") TARGET_LINK_LIBRARIES(RemoteVstPlugin32 -lQtCore4 -lpthread -lgdi32 -lws2_32) -ADD_CUSTOM_COMMAND(TARGET RemoteVstPlugin32 POST_BUILD COMMAND ${STRIP} ${CMAKE_CURRENT_BINARY_DIR}/RemoteVstPlugin32.exe) +ADD_CUSTOM_COMMAND(TARGET RemoteVstPlugin32 POST_BUILD COMMAND "${STRIP}" "\"${CMAKE_CURRENT_BINARY_DIR}/RemoteVstPlugin32.exe\"") SET_TARGET_PROPERTIES(RemoteVstPlugin32 PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -O3") -INSTALL(TARGETS RemoteVstPlugin32 RUNTIME DESTINATION ${PLUGIN_DIR}/32) - -INSTALL(FILES - ${MINGW_PREFIX32}/bin/QtCore4.dll - ${MINGW_PREFIX32}/bin/zlib1.dll - DESTINATION ${PLUGIN_DIR}/32) +INSTALL(TARGETS RemoteVstPlugin32 RUNTIME DESTINATION "${PLUGIN_DIR}/32") +INSTALL(FILES "${MINGW_PREFIX32}/bin/QtCore4.dll" "${MINGW_PREFIX32}/bin/zlib1.dll" + DESTINATION "${PLUGIN_DIR}/32") diff --git a/plugins/vst_effect/CMakeLists.txt b/plugins/vst_effect/CMakeLists.txt index 6f183c03e..518750594 100644 --- a/plugins/vst_effect/CMakeLists.txt +++ b/plugins/vst_effect/CMakeLists.txt @@ -1,12 +1,9 @@ IF(LMMS_SUPPORT_VST) INCLUDE(BuildPlugin) - -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../vst_base) -LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../vst_base) +INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../vst_base") +LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/../vst_base") LINK_LIBRARIES(vstbase) - -BUILD_PLUGIN(vsteffect VstEffect.cpp VstEffectControls.cpp VstEffectControlDialog.cpp VstSubPluginFeatures.cpp VstEffect.h VstEffectControls.h VstEffectControlDialog.h VstSubPluginFeatures.h MOCFILES VstEffectControls.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) - +BUILD_PLUGIN(vsteffect VstEffect.cpp VstEffectControls.cpp VstEffectControlDialog.cpp VstSubPluginFeatures.cpp VstEffect.h VstEffectControls.h VstEffectControlDialog.h VstSubPluginFeatures.h MOCFILES VstEffectControls.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") SET_TARGET_PROPERTIES(vsteffect PROPERTIES COMPILE_FLAGS "-Wno-attributes") ENDIF(LMMS_SUPPORT_VST) diff --git a/plugins/zynaddsubfx/CMakeLists.txt b/plugins/zynaddsubfx/CMakeLists.txt index 046194979..17e7c88fd 100644 --- a/plugins/zynaddsubfx/CMakeLists.txt +++ b/plugins/zynaddsubfx/CMakeLists.txt @@ -1,24 +1,24 @@ INCLUDE(BuildPlugin) SET(ZYN_SRC_GUI - ${CMAKE_CURRENT_SOURCE_DIR}/src/UI/MasterUI.cc - ${CMAKE_CURRENT_SOURCE_DIR}/src/UI/VirKeyboard.cc - ${CMAKE_CURRENT_SOURCE_DIR}/src/UI/ConfigUI.cc - ${CMAKE_CURRENT_SOURCE_DIR}/src/UI/OscilGenUI.cc - ${CMAKE_CURRENT_SOURCE_DIR}/src/UI/WidgetPDial.cc - ${CMAKE_CURRENT_SOURCE_DIR}/src/UI/ResonanceUI.cc - ${CMAKE_CURRENT_SOURCE_DIR}/src/UI/MicrotonalUI.cc - ${CMAKE_CURRENT_SOURCE_DIR}/src/UI/ADnoteUI.cc - ${CMAKE_CURRENT_SOURCE_DIR}/src/UI/PresetsUI.cc - ${CMAKE_CURRENT_SOURCE_DIR}/src/UI/EffUI.cc - ${CMAKE_CURRENT_SOURCE_DIR}/src/UI/FilterUI.cc - ${CMAKE_CURRENT_SOURCE_DIR}/src/UI/PartUI.cc - ${CMAKE_CURRENT_SOURCE_DIR}/src/UI/EnvelopeUI.cc - ${CMAKE_CURRENT_SOURCE_DIR}/src/UI/LFOUI.cc - ${CMAKE_CURRENT_SOURCE_DIR}/src/UI/SeqUI.cc - ${CMAKE_CURRENT_SOURCE_DIR}/src/UI/PADnoteUI.cc - ${CMAKE_CURRENT_SOURCE_DIR}/src/UI/SUBnoteUI.cc - ${CMAKE_CURRENT_SOURCE_DIR}/src/UI/BankUI.cc + "${CMAKE_CURRENT_SOURCE_DIR}/src/UI/MasterUI.cc" + "${CMAKE_CURRENT_SOURCE_DIR}/src/UI/VirKeyboard.cc" + "${CMAKE_CURRENT_SOURCE_DIR}/src/UI/ConfigUI.cc" + "${CMAKE_CURRENT_SOURCE_DIR}/src/UI/OscilGenUI.cc" + "${CMAKE_CURRENT_SOURCE_DIR}/src/UI/WidgetPDial.cc" + "${CMAKE_CURRENT_SOURCE_DIR}/src/UI/ResonanceUI.cc" + "${CMAKE_CURRENT_SOURCE_DIR}/src/UI/MicrotonalUI.cc" + "${CMAKE_CURRENT_SOURCE_DIR}/src/UI/ADnoteUI.cc" + "${CMAKE_CURRENT_SOURCE_DIR}/src/UI/PresetsUI.cc" + "${CMAKE_CURRENT_SOURCE_DIR}/src/UI/EffUI.cc" + "${CMAKE_CURRENT_SOURCE_DIR}/src/UI/FilterUI.cc" + "${CMAKE_CURRENT_SOURCE_DIR}/src/UI/PartUI.cc" + "${CMAKE_CURRENT_SOURCE_DIR}/src/UI/EnvelopeUI.cc" + "${CMAKE_CURRENT_SOURCE_DIR}/src/UI/LFOUI.cc" + "${CMAKE_CURRENT_SOURCE_DIR}/src/UI/SeqUI.cc" + "${CMAKE_CURRENT_SOURCE_DIR}/src/UI/PADnoteUI.cc" + "${CMAKE_CURRENT_SOURCE_DIR}/src/UI/SUBnoteUI.cc" + "${CMAKE_CURRENT_SOURCE_DIR}/src/UI/BankUI.cc" ) @@ -45,8 +45,11 @@ IF(LMMS_BUILD_WIN32) ADD_DEFINITIONS(-DPTW32_STATIC_LIB) ENDIF(LMMS_BUILD_WIN32) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/fltk/ ${CMAKE_CURRENT_SOURCE_DIR} ${FFTW3F_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ) - +INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/fltk/" + "${CMAKE_CURRENT_SOURCE_DIR}" + ${FFTW3F_INCLUDE_DIRS} + "${CMAKE_CURRENT_BINARY_DIR}" + "${CMAKE_BINARY_DIR}") set(ZASF_CORE_LIBS zynaddsubfx_input zynaddsubfx_output @@ -76,29 +79,29 @@ ADD_LIBRARY(ZynAddSubFxCore SHARED LocalZynAddSubFx.cpp) TARGET_LINK_LIBRARIES(ZynAddSubFxCore ${ZASF_CORE_LIBS} ${FFTW3F_LIBRARIES} ${QT_LIBRARIES} -lz -lpthread) IF(LMMS_BUILD_WIN32) TARGET_LINK_LIBRARIES(ZynAddSubFxCore -lws2_32) - INSTALL(TARGETS ZynAddSubFxCore RUNTIME DESTINATION ${PLUGIN_DIR}) + INSTALL(TARGETS ZynAddSubFxCore RUNTIME DESTINATION "${PLUGIN_DIR}") ELSE(LMMS_BUILD_WIN32) - INSTALL(TARGETS ZynAddSubFxCore LIBRARY DESTINATION ${PLUGIN_DIR}) + INSTALL(TARGETS ZynAddSubFxCore LIBRARY DESTINATION "${PLUGIN_DIR}") ENDIF(LMMS_BUILD_WIN32) -BUILD_PLUGIN(zynaddsubfx ZynAddSubFx.cpp ZynAddSubFx.h MOCFILES ZynAddSubFx.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) +BUILD_PLUGIN(zynaddsubfx ZynAddSubFx.cpp ZynAddSubFx.h MOCFILES ZynAddSubFx.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") TARGET_LINK_LIBRARIES(zynaddsubfx ZynAddSubFxCore) IF(WIN32) SET(WINRC "${CMAKE_CURRENT_BINARY_DIR}/zynaddsubfxrc.obj") - ADD_CUSTOM_COMMAND(OUTPUT ${WINRC} - COMMAND ${WINDRES} - -I${CMAKE_CURRENT_SOURCE_DIR} - -o${CMAKE_CURRENT_BINARY_DIR}/zynaddsubfxrc.obj - -i${CMAKE_CURRENT_BINARY_DIR}/zynaddsubfx.rc - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/zynaddsubfx.rc) + ADD_CUSTOM_COMMAND(OUTPUT "${WINRC}" + COMMAND "${WINDRES}" + "-I\"${CMAKE_CURRENT_SOURCE_DIR}\"" + "-o\"${CMAKE_CURRENT_BINARY_DIR}/zynaddsubfxrc.obj\"" + "-i\"${CMAKE_CURRENT_BINARY_DIR}/zynaddsubfx.rc\"" + DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/zynaddsubfx.rc") ENDIF(WIN32) SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}") SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp ${ZYN_SRC_GUI} ${WINRC}) -INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION ${PLUGIN_DIR}) -TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -lpthread -L${CMAKE_CURRENT_BINARY_DIR} -lZynAddSubFxCore ${CMAKE_CURRENT_BINARY_DIR}/fltk/lib/libfltk.a) +ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp ${ZYN_SRC_GUI} "${WINRC}") +INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION "${PLUGIN_DIR}") +TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -lpthread "-L\"${CMAKE_CURRENT_BINARY_DIR}\"" -lZynAddSubFxCore "${CMAKE_CURRENT_BINARY_DIR}/fltk/lib/libfltk.a") ADD_DEPENDENCIES(RemoteZynAddSubFx ZynAddSubFxCore) # link system libraries when on win32 @@ -116,8 +119,8 @@ ENDIF(LMMS_BUILD_LINUX) IF(LMMS_BUILD_WIN32) - ADD_CUSTOM_COMMAND(TARGET ZynAddSubFxCore POST_BUILD COMMAND ${STRIP} ${CMAKE_CURRENT_BINARY_DIR}/libZynAddSubFxCore.dll) - ADD_CUSTOM_COMMAND(TARGET RemoteZynAddSubFx POST_BUILD COMMAND ${STRIP} ${CMAKE_CURRENT_BINARY_DIR}/RemoteZynAddSubFx.exe) + ADD_CUSTOM_COMMAND(TARGET ZynAddSubFxCore POST_BUILD COMMAND "${STRIP}" "\"${CMAKE_CURRENT_BINARY_DIR}/libZynAddSubFxCore.dll\"") + ADD_CUSTOM_COMMAND(TARGET RemoteZynAddSubFx POST_BUILD COMMAND "${STRIP}" "\"${CMAKE_CURRENT_BINARY_DIR}/RemoteZynAddSubFx.exe\"") ENDIF(LMMS_BUILD_WIN32) # build FLTK @@ -128,9 +131,8 @@ ELSEIF(LMMS_BUILD_WIN32) ENDIF(LMMS_BUILD_WIN64) IF(NOT FREETYPE_INCLUDE_DIR_freetype2) - SET(FREETYPE_INCLUDE_DIR_freetype2 ${FREETYPE_INCLUDE_DIR_ft2build}/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 e7231f6d9..5545fce27 100644 --- a/plugins/zynaddsubfx/fltk/CMakeLists.txt +++ b/plugins/zynaddsubfx/fltk/CMakeLists.txt @@ -39,41 +39,41 @@ set(FLTK_VERSION_PATCH "0") set(FLTK_VERSION "${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}") set(FLTK_VERSION_FULL "${FLTK_VERSION}.${FLTK_VERSION_PATCH}") -set(EXECUTABLE_OUTPUT_PATH ${FLTK_BINARY_DIR}/bin) -set(LIBRARY_OUTPUT_PATH ${FLTK_BINARY_DIR}/lib) -set(ARCHIVE_OUTPUT_PATH ${FLTK_BINARY_DIR}/lib) +set(EXECUTABLE_OUTPUT_PATH "${FLTK_BINARY_DIR}/bin") +set(LIBRARY_OUTPUT_PATH "${FLTK_BINARY_DIR}/lib") +set(ARCHIVE_OUTPUT_PATH "${FLTK_BINARY_DIR}/lib") # Search for modules in the FLTK source dir first -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${FLTK_SOURCE_DIR}/CMake) +set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${FLTK_SOURCE_DIR}/CMake") -include_directories(${FLTK_SOURCE_DIR} ${FLTK_BINARY_DIR}) +include_directories("${FLTK_SOURCE_DIR}" "${FLTK_BINARY_DIR}") # If this is out-of-source build, then copy FL directory -if(NOT ${FLTK_SOURCE_DIR} STREQUAL ${FLTK_BINARY_DIR}) - file(GLOB FLTK_HEADER_FILES ${FLTK_SOURCE_DIR}/FL/*.[hHr]) +if(NOT "${FLTK_SOURCE_DIR}" STREQUAL "${FLTK_BINARY_DIR}") + file(GLOB FLTK_HEADER_FILES "${FLTK_SOURCE_DIR}/FL/*.[hHr]") foreach(file ${FLTK_HEADER_FILES}) - GET_FILENAME_COMPONENT(name ${file} NAME) - CONFIGURE_file(${file} ${FLTK_BINARY_DIR}/FL/${name} COPYONLY) + GET_FILENAME_COMPONENT(name "${file}" NAME) + CONFIGURE_file("${file}" "${FLTK_BINARY_DIR}/FL/${name}" COPYONLY) endforeach(file) -endif(NOT ${FLTK_SOURCE_DIR} STREQUAL ${FLTK_BINARY_DIR}) +endif(NOT "${FLTK_SOURCE_DIR}" STREQUAL "${FLTK_BINARY_DIR}") ####################################################################### # platform dependent information ####################################################################### # On unix create backward compatibility symlinks if(CMAKE_HOST_UNIX) - if(NOT EXISTS ${FLTK_BINARY_DIR}/Fl) + if(NOT EXISTS "${FLTK_BINARY_DIR}/Fl") EXECUTE_PROCESS(COMMAND ln -s FL Fl - WORKING_DIRECTORY ${FLTK_BINARY_DIR} + WORKING_DIRECTORY "${FLTK_BINARY_DIR}" ) - endif(NOT EXISTS ${FLTK_BINARY_DIR}/Fl) + endif(NOT EXISTS "${FLTK_BINARY_DIR}/Fl") - file(GLOB FLTK_HEADER_FILES ${FLTK_BINARY_DIR}/FL/*.H) + file(GLOB FLTK_HEADER_FILES "${FLTK_BINARY_DIR}/FL/*.H") foreach(file ${FLTK_HEADER_FILES}) - GET_FILENAME_COMPONENT(nameWE ${file} NAME_WE) - if(NOT EXISTS ${FLTK_BINARY_DIR}/FL/${nameWE}.h) - EXECUTE_PROCESS(COMMAND ln -s ${nameWE}.H ${nameWE}.h - WORKING_DIRECTORY ${FLTK_BINARY_DIR}/FL + GET_FILENAME_COMPONENT(nameWE "${file}" NAME_WE) + if(NOT EXISTS "${FLTK_BINARY_DIR}/FL/${nameWE}.h") + EXECUTE_PROCESS(COMMAND ln -s "${nameWE}.H" "${nameWE}.h" + WORKING_DIRECTORY "${FLTK_BINARY_DIR}/FL" ) endif() endforeach(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) @@ -223,8 +223,8 @@ if(HAVE_SCANDIR AND NOT HAVE_SCANDIR_POSIX) set(MSG "POSIX compatible scandir") message(STATUS "Looking for ${MSG}") try_compile(V - ${FLTK_BINARY_DIR} - ${FLTK_SOURCE_DIR}/CMake/posixScandir.cxx + "${FLTK_BINARY_DIR}" + "${FLTK_SOURCE_DIR}/CMake/posixScandir.cxx" ) if(V) message(STATUS "${MSG} - found") @@ -259,9 +259,9 @@ set(OPTION_PREFIX_BIN "" ) if(OPTION_PREFIX_BIN) - set(PREFIX_BIN ${OPTION_PREFIX_BIN} CACHE INTERNAL "" FORCE) + set(PREFIX_BIN "${OPTION_PREFIX_BIN}" CACHE INTERNAL "" FORCE) else() - set(PREFIX_BIN ${CMAKE_INSTALL_PREFIX}/bin CACHE INTERNAL "" FORCE) + set(PREFIX_BIN "${CMAKE_INSTALL_PREFIX}/bin" CACHE INTERNAL "" FORCE) endif(OPTION_PREFIX_BIN) ####################################################################### @@ -271,9 +271,9 @@ set(OPTION_PREFIX_LIB "" ) if(OPTION_PREFIX_LIB) - set(PREFIX_LIB ${OPTION_PREFIX_LIB} CACHE INTERNAL "" FORCE) + set(PREFIX_LIB "${OPTION_PREFIX_LIB}" CACHE INTERNAL "" FORCE) else() - set(PREFIX_LIB ${CMAKE_INSTALL_PREFIX}/lib CACHE INTERNAL "" FORCE) + set(PREFIX_LIB "${CMAKE_INSTALL_PREFIX}/lib" CACHE INTERNAL "" FORCE) endif(OPTION_PREFIX_LIB) ####################################################################### @@ -283,9 +283,9 @@ set(OPTION_PREFIX_INCLUDE "" ) if(OPTION_PREFIX_INCLUDE) - set(PREFIX_INCLUDE ${OPTION_PREFIX_INCLUDE} CACHE INTERNAL "" FORCE) + set(PREFIX_INCLUDE "${OPTION_PREFIX_INCLUDE}" CACHE INTERNAL "" FORCE) else() - set(PREFIX_INCLUDE ${CMAKE_INSTALL_PREFIX}/include CACHE INTERNAL "" FORCE) + set(PREFIX_INCLUDE "${CMAKE_INSTALL_PREFIX}/include" CACHE INTERNAL "" FORCE) endif(OPTION_PREFIX_INCLUDE) ####################################################################### @@ -295,9 +295,9 @@ set(OPTION_PREFIX_DATA "" ) if(OPTION_PREFIX_DATA) - set(PREFIX_DATA ${OPTION_PREFIX_DATA} CACHE INTERNAL "" FORCE) + set(PREFIX_DATA "${OPTION_PREFIX_DATA}" CACHE INTERNAL "" FORCE) else() - set(PREFIX_DATA ${CMAKE_INSTALL_PREFIX}/share/FLTK CACHE INTERNAL "" FORCE) + set(PREFIX_DATA "${CMAKE_INSTALL_PREFIX}/share/FLTK" CACHE INTERNAL "" FORCE) endif(OPTION_PREFIX_DATA) ####################################################################### @@ -307,9 +307,9 @@ set(OPTION_PREFIX_DOC "" ) if(OPTION_PREFIX_DOC) - set(PREFIX_DOC ${OPTION_PREFIX_DOC} CACHE INTERNAL "" FORCE) + set(PREFIX_DOC "${OPTION_PREFIX_DOC}" CACHE INTERNAL "" FORCE) else() - set(PREFIX_DOC ${CMAKE_INSTALL_PREFIX}/share/doc/FLTK CACHE INTERNAL "" FORCE) + set(PREFIX_DOC "${CMAKE_INSTALL_PREFIX}/share/doc/FLTK" CACHE INTERNAL "" FORCE) endif(OPTION_PREFIX_DOC) ####################################################################### @@ -340,9 +340,9 @@ if(CMAKE_HOST_UNIX) ) if(OPTION_PREFIX_MAN) - set(PREFIX_MAN ${OPTION_PREFIX_MAN} CACHE INTERNAL "" FORCE) + set(PREFIX_MAN "${OPTION_PREFIX_MAN}" CACHE INTERNAL "" FORCE) else() - set(PREFIX_MAN ${CMAKE_INSTALL_PREFIX}/man CACHE INTERNAL "" FORCE) + set(PREFIX_MAN "${CMAKE_INSTALL_PREFIX}/man" CACHE INTERNAL "" FORCE) endif(OPTION_PREFIX_MAN) endif(CMAKE_HOST_UNIX) @@ -413,7 +413,7 @@ if(OPTION_USE_GL) endif(OPTION_USE_GL) if(OPENGL_FOUND) - set(CMAKE_REQUIRED_INCLUDES ${OPENGL_INCLUDE_DIR}/GL) + set(CMAKE_REQUIRED_INCLUDES "${OPENGL_INCLUDE_DIR}/GL") set(CMAKE_REQUIRED_LIBRARIES -lGLU -lGL) CHECK_FUNCTION_EXISTS(glXGetProcAddressARB HAVE_GLXGETPROCADDRESSARB) set(FLTK_GL_FOUND TRUE) @@ -466,11 +466,11 @@ endif(OPTION_USE_SYSTEM_LIBJPEG AND LIB_jpeg) if(OPTION_USE_SYSTEM_LIBJPEG AND JPEG_FOUND) set(FLTK_JPEG_LIBRARIES ${JPEG_LIBRARIES}) - include_directories(${JPEG_INCLUDE_DIR}) + include_directories("${JPEG_INCLUDE_DIR}") set(FLTK_BUILTIN_JPEG_FOUND FALSE) else() set(FLTK_JPEG_LIBRARIES fltk_jpeg) - include_directories(${FLTK_SOURCE_DIR}/jpeg) + include_directories("${FLTK_SOURCE_DIR}/jpeg") set(FLTK_BUILTIN_JPEG_FOUND TRUE) endif(OPTION_USE_SYSTEM_LIBJPEG AND JPEG_FOUND) @@ -493,8 +493,8 @@ if(OPTION_USE_SYSTEM_ZLIB AND ZLIB_FOUND) set(FLTK_BUILTIN_ZLIB_FOUND FALSE) else() set(FLTK_ZLIB_LIBRARIES fltk_z) - set(ZLIB_INCLUDE_DIR ${FLTK_SOURCE_DIR}/zlib) - include_directories(${FLTK_SOURCE_DIR}/zlib) + set(ZLIB_INCLUDE_DIR "${FLTK_SOURCE_DIR}/zlib") + include_directories("${ZLIB_INCLUDE_DIR}") set(FLTK_BUILTIN_ZLIB_FOUND TRUE) endif(OPTION_USE_SYSTEM_ZLIB AND ZLIB_FOUND) @@ -513,7 +513,7 @@ endif(OPTION_USE_SYSTEM_LIBPNG AND LIB_png) if(OPTION_USE_SYSTEM_LIBPNG AND PNG_FOUND) set(FLTK_PNG_LIBRARIES ${PNG_LIBRARIES}) - include_directories(${PNG_INCLUDE_DIR}) + include_directories("${PNG_INCLUDE_DIR}") add_definitions(${PNG_DEFINITIONS}) set(FLTK_BUILTIN_PNG_FOUND FALSE) else() @@ -521,7 +521,7 @@ else() set(HAVE_PNG_H 1) set(HAVE_PNG_GET_VALID 1) set(HAVE_PNG_SET_TRNS_TO_ALPHA 1) - include_directories(${FLTK_SOURCE_DIR}/png) + include_directories("${FLTK_SOURCE_DIR}/png") set(FLTK_BUILTIN_PNG_FOUND TRUE) endif(OPTION_USE_SYSTEM_LIBPNG AND PNG_FOUND) @@ -538,7 +538,7 @@ endif(X11_Xinerama_FOUND) if(OPTION_USE_XINERAMA) set(HAVE_XINERAMA X11_Xinerama_FOUND) - include_directories(${X11_Xinerama_INCLUDE_PATH}) + include_directories("${X11_Xinerama_INCLUDE_PATH}") list(APPEND FLTK_LDLIBS -lXinerama) set(FLTK_XINERAMA_FOUND TRUE) else() @@ -582,27 +582,27 @@ if(CMAKE_CROSSCOMPILING) ) add_executable(fluid IMPORTED) set(FLTK_FLUID_EXECUTABLE fluid) - set(FLTK_FLUID_PATH ${FLUID_PATH}) + set(FLTK_FLUID_PATH "${FLUID_PATH}") set_target_properties(fluid - PROPERTIES IMPORTED_LOCATION ${FLUID_PATH} + PROPERTIES IMPORTED_LOCATION "${FLUID_PATH}" ) else() set(FLTK_FLUID_EXECUTABLE fluid) - set(FLTK_FLUID_PATH ${EXECUTABLE_OUTPUT_PATH}/${FLTK_FLUID_EXECUTABLE}) + set(FLTK_FLUID_PATH "${EXECUTABLE_OUTPUT_PATH}/${FLTK_FLUID_EXECUTABLE}") endif(CMAKE_CROSSCOMPILING) add_subdirectory(src) # generate FLTKConfig.cmake string(REPLACE ";" " " EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}") -configure_file(${FLTK_SOURCE_DIR}/CMake/FLTKConfig.cmake.in - ${EXECUTABLE_OUTPUT_PATH}/FLTKConfig.cmake +configure_file("${FLTK_SOURCE_DIR}/CMake/FLTKConfig.cmake.in" + "${EXECUTABLE_OUTPUT_PATH}/FLTKConfig.cmake" @ONLY ) # generate UseFLTK.cmake -configure_file(${FLTK_SOURCE_DIR}/CMake/UseFLTK.cmake.in - ${EXECUTABLE_OUTPUT_PATH}/UseFLTK.cmake +configure_file("${FLTK_SOURCE_DIR}/CMake/UseFLTK.cmake.in" + "${EXECUTABLE_OUTPUT_PATH}/UseFLTK.cmake" @ONLY ) @@ -612,8 +612,8 @@ configure_file("${FLTK_SOURCE_DIR}/configh.cmake.in" ) # generate fltk-config -get_filename_component(CC ${CMAKE_C_COMPILER} NAME) -get_filename_component(CXX ${CMAKE_CXX_COMPILER} NAME) +get_filename_component(CC "${CMAKE_C_COMPILER}" NAME) +get_filename_component(CXX "${CMAKE_CXX_COMPILER}" NAME) string(REPLACE ";" " " C_FLAGS "${FLTK_CFLAGS}") @@ -622,12 +622,12 @@ if(X11_Xext_FOUND) endif(X11_Xext_FOUND) string(REPLACE ";" " " LD_LIBS "${FLTK_LDLIBS}") -configure_file(${FLTK_SOURCE_DIR}/fltk-config.cmake.in - ${FLTK_BINARY_DIR}/fltk-config +configure_file("${FLTK_SOURCE_DIR}/fltk-config.cmake.in" + "${FLTK_BINARY_DIR}/fltk-config" ) if(UNIX) execute_process(COMMAND chmod 755 fltk-config - WORKING_DIRECTORY ${FLTK_BINARY_DIR} + WORKING_DIRECTORY "${FLTK_BINARY_DIR}" ) endif(UNIX) @@ -638,7 +638,7 @@ configure_file( @ONLY ) add_custom_target(uninstall - "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" + "${CMAKE_COMMAND}" -P "\"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake\"" ) ####################################################################### @@ -652,38 +652,33 @@ endif(OPTION_BUILD_EXAMPLES) # installation ####################################################################### -install(DIRECTORY ${FLTK_BINARY_DIR}/FL - DESTINATION ${PREFIX_INCLUDE} USE_SOURCE_PERMISSIONS +install(DIRECTORY "${FLTK_BINARY_DIR}/FL" + DESTINATION "${PREFIX_INCLUDE}" USE_SOURCE_PERMISSIONS ) - -install(DIRECTORY ${FLTK_BINARY_DIR}/Fl - DESTINATION ${PREFIX_INCLUDE} USE_SOURCE_PERMISSIONS +install(DIRECTORY "${FLTK_BINARY_DIR}/Fl" + DESTINATION "${PREFIX_INCLUDE}" USE_SOURCE_PERMISSIONS ) - -install(PROGRAMS ${FLTK_BINARY_DIR}/fltk-config - DESTINATION ${PREFIX_BIN} +install(PROGRAMS "${FLTK_BINARY_DIR}/fltk-config" + DESTINATION "${PREFIX_BIN}" OPTIONAL ) - install(EXPORT fltk-install - DESTINATION ${PREFIX_CONFIG} + DESTINATION "${PREFIX_CONFIG}" FILE FLTKLibraries.cmake ) - -install(FILES ${EXECUTABLE_OUTPUT_PATH}/FLTKConfig.cmake - DESTINATION ${PREFIX_CONFIG} +install(FILES "${EXECUTABLE_OUTPUT_PATH}/FLTKConfig.cmake" + DESTINATION "${PREFIX_CONFIG}" ) - -install(FILES ${EXECUTABLE_OUTPUT_PATH}/UseFLTK.cmake - DESTINATION ${PREFIX_CONFIG} +install(FILES "${EXECUTABLE_OUTPUT_PATH}/UseFLTK.cmake" + DESTINATION "${PREFIX_CONFIG}" ) if(CMAKE_HOST_UNIX) macro(INSTALL_MAN FILE LEVEL) install(FILES - ${FLTK_SOURCE_DIR}/documentation/src/${FILE}.man - DESTINATION ${PREFIX_MAN}/man${LEVEL} - RENAME ${FILE}.${LEVEL} + "${FLTK_SOURCE_DIR}/documentation/src/${FILE}.man" + DESTINATION "${PREFIX_MAN}/man${LEVEL}" + RENAME "${FILE}.${LEVEL}" ) endmacro(INSTALL_MAN FILE LEVEL) diff --git a/plugins/zynaddsubfx/fltk/src/CMakeLists.txt b/plugins/zynaddsubfx/fltk/src/CMakeLists.txt index f5feedc02..470c3016c 100644 --- a/plugins/zynaddsubfx/fltk/src/CMakeLists.txt +++ b/plugins/zynaddsubfx/fltk/src/CMakeLists.txt @@ -252,7 +252,7 @@ endif(LIB_fontconfig) ####################################################################### install(TARGETS fltk EXPORT fltk-install - DESTINATION ${PREFIX_LIB} + DESTINATION "${PREFIX_LIB}" ) ####################################################################### @@ -323,7 +323,7 @@ endif(USE_X11) ####################################################################### install(TARGETS fltk_SHARED EXPORT fltk-install - DESTINATION ${PREFIX_LIB} + DESTINATION "${PREFIX_LIB}" ) ####################################################################### @@ -351,7 +351,7 @@ if(OPENGL_FOUND) install(TARGETS fltk_gl_SHARED EXPORT fltk-install - DESTINATION ${PREFIX_LIB} + DESTINATION "${PREFIX_LIB}" ) endif(OPENGL_FOUND) diff --git a/plugins/zynaddsubfx/src/Misc/CMakeLists.txt b/plugins/zynaddsubfx/src/Misc/CMakeLists.txt index 8b883f379..eb68d5805 100644 --- a/plugins/zynaddsubfx/src/Misc/CMakeLists.txt +++ b/plugins/zynaddsubfx/src/Misc/CMakeLists.txt @@ -1,4 +1,6 @@ -include_directories(${MXML_INCLUDE_DIR}) +if(NOT ("${MXML_INCLUDE_DIR}" STREQUAL "")) + include_directories("${MXML_INCLUDE_DIR}") +endif() set(zynaddsubfx_misc_SRCS Bank.cpp diff --git a/plugins/zynaddsubfx/src/Output/CMakeLists.txt b/plugins/zynaddsubfx/src/Output/CMakeLists.txt index 81a42fdb6..e69296e71 100644 --- a/plugins/zynaddsubfx/src/Output/CMakeLists.txt +++ b/plugins/zynaddsubfx/src/Output/CMakeLists.txt @@ -11,7 +11,7 @@ if(AlsaMidiOutput) endif(AlsaMidiOutput) if(JackOutput) - include_directories(${JACK_INCLUDE_DIR}) + include_directories("${JACK_INCLUDE_DIR}") set(zynaddsubfx_output_SRCS ${zynaddsubfx_output_SRCS} JACKaudiooutput.cpp) @@ -19,7 +19,7 @@ if(JackOutput) endif(JackOutput) if(PortAudioOutput) - include_directories(${PORTAUDIO_INCLUDE_DIR}) + include_directories("${PORTAUDIO_INCLUDE_DIR}") set(zynaddsubfx_output_SRCS ${zynaddsubfx_output_SRCS} PAaudiooutput.cpp) diff --git a/plugins/zynaddsubfx/src/UI/CMakeLists.txt b/plugins/zynaddsubfx/src/UI/CMakeLists.txt index 49336b2dc..2c959e446 100644 --- a/plugins/zynaddsubfx/src/UI/CMakeLists.txt +++ b/plugins/zynaddsubfx/src/UI/CMakeLists.txt @@ -19,7 +19,7 @@ set(UI_fl_files WidgetPDial.fl ) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories("${CMAKE_CURRENT_BINARY_DIR}") set_source_files_properties(UI/MasterUI.h PROPERTIES GENERATED 1) fltk_wrap_ui(zynaddsubfx_gui ${UI_fl_files})