From be0c5b9bc4b3ef5d5cfcbbfa75631019cfa1569d Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Tue, 22 Jul 2008 23:50:59 +0000 Subject: [PATCH] various fixes for allowing out-of-tree builds git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1363 0778d3d1-df1d-0410-868b-ea421aaaa00d --- CMakeLists.txt | 36 +++++++++---------- ChangeLog | 26 ++++++++++++++ cmake/modules/BuildPlugin.cmake | 4 +-- plugins/audio_file_processor/CMakeLists.txt | 2 +- plugins/bass_booster/CMakeLists.txt | 2 +- plugins/bit_invader/CMakeLists.txt | 2 +- plugins/flp_import/CMakeLists.txt | 2 +- plugins/kicker/CMakeLists.txt | 2 +- plugins/ladspa_browser/CMakeLists.txt | 2 +- plugins/ladspa_effect/CMakeLists.txt | 2 +- plugins/lb302/CMakeLists.txt | 2 +- plugins/lb303/CMakeLists.txt | 2 +- plugins/live_tool/CMakeLists.txt | 2 +- plugins/organic/CMakeLists.txt | 2 +- plugins/patman/CMakeLists.txt | 2 +- plugins/peak_controller_effect/CMakeLists.txt | 2 +- plugins/sf2_player/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 | 2 +- plugins/triple_oscillator/CMakeLists.txt | 2 +- plugins/vestige/CMakeLists.txt | 2 +- plugins/vibed/CMakeLists.txt | 2 +- plugins/vst_effect/CMakeLists.txt | 2 +- 25 files changed, 68 insertions(+), 42 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e9532f8c..e2af70e0c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.0) PROJECT(lmms) -SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) +SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules) SET(CMAKE_BUILD_TYPE relwithdebinfo) IF(COMMAND CMAKE_POLICY) @@ -188,7 +188,7 @@ ENDIF(LMMS_HAVE_SOUNDCARD_H OR LMMS_HAVE_SYS_SOUNDCARD_H) # check for ALSA IF(WANT_ALSA) INCLUDE(FindAlsa) - ALSA_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/alsaconfig.h) + ALSA_CONFIGURE_FILE(${CMAKE_BINARY_DIR}/alsaconfig.h) IF(ALSA_FOUND) SET(LMMS_HAVE_ALSA TRUE) ENDIF(ALSA_FOUND) @@ -256,28 +256,28 @@ IF(WANT_SYSTEM_SR) ENDIF(SAMPLERATE_FOUND) ENDIF(WANT_SYSTEM_SR) IF(NOT LMMS_HAVE_SAMPLERATE) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_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_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/samplerate.c - ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/samplerate.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/src_sinc.c - ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/high_qual_coeffs.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/mid_qual_coeffs.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/fastest_coeffs.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/common.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/config.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/float_cast.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/src_zoh.c - ${CMAKE_CURRENT_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/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_CURRENT_SOURCE_DIR}/lmmsconfig.h.in ${CMAKE_CURRENT_SOURCE_DIR}/lmmsconfig.h) +CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/lmmsconfig.h.in ${CMAKE_BINARY_DIR}/lmmsconfig.h) # people simply updating SVN will still have this and mess up build with it FILE(REMOVE include/lmmsconfig.h) @@ -287,7 +287,7 @@ FILE(GLOB_RECURSE lmms_SOURCES src/*.cpp) SET(lmms_MOC ${lmms_INCLUDES}) -SET(lmms_EMBEDDED_RESOURCES AUTHORS COPYING) +SET(lmms_EMBEDDED_RESOURCES ${CMAKE_SOURCE_DIR}/AUTHORS ${CMAKE_SOURCE_DIR}/COPYING) QT4_WRAP_CPP(lmms_MOC_out ${lmms_MOC} OPTIONS -nw -DLMMS_HAVE_ALSA -DLMMS_BUILD_WIN32) QT4_WRAP_UI(lmms_UI_out ${lmms_UI}) @@ -305,7 +305,7 @@ ADD_CUSTOM_COMMAND(OUTPUT ${ER_H} COMMAND ${BIN2RES} ARGS ${lmms_EMBEDDED_RESOUR SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-attributes") IF(NOT WIN32) - SET(CMAKE_CURRENT_SOURCE_DIR "${CMAKE_CXX_FLAGS} -fPIC") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") ENDIF(NOT WIN32) # make sub-directories @@ -317,7 +317,7 @@ ADD_SUBDIRECTORY(data) # ADD_DEFINITIONS(-D'LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/"' -D'PLUGIN_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS}) -INCLUDE_DIRECTORIES(include . ${SDL_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIR} ${JACK_INCLUDE_DIRS} ${OGGVORBIS_INCLUDE_DIR} ${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} ${PULSEAUDIO_INCLUDE_DIR} ${JACK_INCLUDE_DIRS} ${OGGVORBIS_INCLUDE_DIR} ${SAMPLERATE_INCLUDE_DIRS} ${SNDFILE_INCLUDE_DIRS}) LINK_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/lib ${ASOUND_LIBRARY_DIR} ${JACK_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DIRS}) LINK_LIBRARIES(${QT_LIBRARIES} ${ASOUND_LIBRARY} ${SDL_LIBRARY} ${PULSEAUDIO_LIBRARIES} ${JACK_LIBRARIES} ${OGGVORBIS_LIBRARIES} ${SAMPLERATE_LIBRARIES} ${SNDFILE_LIBRARIES}) diff --git a/ChangeLog b/ChangeLog index 5a1654c59..b3e92ebae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,31 @@ 2008-07-22 Tobias Doerffel + * cmake/modules/BuildPlugin.cmake: + * plugins/patman/CMakeLists.txt: + * plugins/ladspa_effect/CMakeLists.txt: + * plugins/organic/CMakeLists.txt: + * plugins/lb302/CMakeLists.txt: + * plugins/lb303/CMakeLists.txt: + * plugins/bass_booster/CMakeLists.txt: + * plugins/stereo_matrix/CMakeLists.txt: + * plugins/bit_invader/CMakeLists.txt: + * plugins/vst_effect/CMakeLists.txt: + * plugins/vibed/CMakeLists.txt: + * plugins/triple_oscillator/CMakeLists.txt: + * plugins/live_tool/CMakeLists.txt: + * plugins/peak_controller_effect/CMakeLists.txt: + * plugins/audio_file_processor/CMakeLists.txt: + * plugins/stk/mallets/CMakeLists.txt: + * plugins/stereo_enhancer/CMakeLists.txt: + * plugins/sf2_player/CMakeLists.txt: + * plugins/vestige/CMakeLists.txt: + * plugins/ladspa_browser/CMakeLists.txt: + * plugins/spectrum_analyzer/CMakeLists.txt: + * plugins/kicker/CMakeLists.txt: + * plugins/flp_import/CMakeLists.txt: + * CMakeLists.txt: + various fixes for allowing out-of-tree builds + * CMakeLists.txt: - initial support for CPack - remove old include/lmmsconfig.h from the autotools-era diff --git a/cmake/modules/BuildPlugin.cmake b/cmake/modules/BuildPlugin.cmake index 8dbbd53d9..a87573f4c 100644 --- a/cmake/modules/BuildPlugin.cmake +++ b/cmake/modules/BuildPlugin.cmake @@ -47,7 +47,7 @@ MACRO(BUILD_PLUGIN) CAR(PLUGIN_NAME ${PLUGIN_DEFAULT_ARGS}) CDR(PLUGIN_SOURCES ${PLUGIN_DEFAULT_ARGS}) - INCLUDE_DIRECTORIES(. ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/src/gui) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/src/gui) ADD_DEFINITIONS(-DPLUGIN_NAME=${PLUGIN_NAME}) @@ -66,7 +66,7 @@ MACRO(BUILD_PLUGIN) ADD_FILE_DEPENDENCIES(${f} ${ER_H} ${plugin_MOC_out} ${plugin_UIC_out}) ENDFOREACH(f) IF(LMMS_BUILD_WIN32) - LINK_DIRECTORIES(${CMAKE_SOURCE_DIR}) + LINK_DIRECTORIES(${CMAKE_BINARY_DIR}) LINK_LIBRARIES(-llmms ${QT_LIBRARIES}) ENDIF(LMMS_BUILD_WIN32) ADD_LIBRARY(${PLUGIN_NAME} SHARED ${PLUGIN_SOURCES}) diff --git a/plugins/audio_file_processor/CMakeLists.txt b/plugins/audio_file_processor/CMakeLists.txt index d7b4620b0..848e6ed2f 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 *.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 33baf78ba..f8cab56cf 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 *.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 fd9ce9afe..786defdbe 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 *.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/flp_import/CMakeLists.txt b/plugins/flp_import/CMakeLists.txt index 8bebdf674..2dfeb3d19 100644 --- a/plugins/flp_import/CMakeLists.txt +++ b/plugins/flp_import/CMakeLists.txt @@ -2,4 +2,4 @@ INCLUDE(BuildPlugin) INCLUDE_DIRECTORIES(unrtf) -BUILD_PLUGIN(flpimport flp_import.cpp flp_import.h MOCFILES EMBEDDED_RESOURCES *.png) +BUILD_PLUGIN(flpimport flp_import.cpp flp_import.h MOCFILES EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) diff --git a/plugins/kicker/CMakeLists.txt b/plugins/kicker/CMakeLists.txt index c2d2d0fe2..a9e40931f 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 *.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 2686e3e73..30ee8268c 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 *.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 a5f1a7786..0832287f2 100644 --- a/plugins/ladspa_effect/CMakeLists.txt +++ b/plugins/ladspa_effect/CMakeLists.txt @@ -1,6 +1,6 @@ INCLUDE(BuildPlugin) -BUILD_PLUGIN(ladspaeffect ladspa_effect.cpp ladspa_controls.cpp ladspa_control_dialog.cpp ladspa_subplugin_features.cpp ladspa_effect.h ladspa_controls.h ladspa_control_dialog.h ladspa_subplugin_features.h MOCFILES ladspa_effect.h ladspa_controls.h ladspa_control_dialog.h EMBEDDED_RESOURCES *.png) +BUILD_PLUGIN(ladspaeffect ladspa_effect.cpp ladspa_controls.cpp ladspa_control_dialog.cpp ladspa_subplugin_features.cpp ladspa_effect.h ladspa_controls.h ladspa_control_dialog.h ladspa_subplugin_features.h MOCFILES ladspa_effect.h ladspa_controls.h ladspa_control_dialog.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) IF(WANT_CAPS) ADD_SUBDIRECTORY(caps) diff --git a/plugins/lb302/CMakeLists.txt b/plugins/lb302/CMakeLists.txt index c75bd770a..0a0c5f80f 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 *.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 81f71c634..69d3bb23d 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 *.png) +BUILD_PLUGIN(lb303 lb303.cpp lb303.h MOCFILES lb303.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) diff --git a/plugins/live_tool/CMakeLists.txt b/plugins/live_tool/CMakeLists.txt index c853f5ed7..85a1c5346 100644 --- a/plugins/live_tool/CMakeLists.txt +++ b/plugins/live_tool/CMakeLists.txt @@ -1,3 +1,3 @@ INCLUDE(BuildPlugin) -BUILD_PLUGIN(livetool live_tool.cpp live_tool.h EMBEDDED_RESOURCES *.png) +BUILD_PLUGIN(livetool live_tool.cpp live_tool.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) diff --git a/plugins/organic/CMakeLists.txt b/plugins/organic/CMakeLists.txt index 8274af798..fadbde92d 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 *.png) +BUILD_PLUGIN(organic organic.cpp organic.h MOCFILES organic.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) diff --git a/plugins/patman/CMakeLists.txt b/plugins/patman/CMakeLists.txt index cf8c7ffdf..dc563b89e 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 *.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 654b8bb08..1a33dad4b 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 *.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 5f9f1ae8a..15e6d7c23 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 *.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/spectrum_analyzer/CMakeLists.txt b/plugins/spectrum_analyzer/CMakeLists.txt index cf627c30d..9b01558da 100644 --- a/plugins/spectrum_analyzer/CMakeLists.txt +++ b/plugins/spectrum_analyzer/CMakeLists.txt @@ -3,6 +3,6 @@ IF(LMMS_HAVE_FFTW3F) 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 *.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) ENDIF(LMMS_HAVE_FFTW3F) diff --git a/plugins/stereo_enhancer/CMakeLists.txt b/plugins/stereo_enhancer/CMakeLists.txt index 729b07781..cca8ab9a5 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 *.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 10b2d833b..7dee06eaf 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 *.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 0f600482d..63fcf8af6 100644 --- a/plugins/stk/mallets/CMakeLists.txt +++ b/plugins/stk/mallets/CMakeLists.txt @@ -1,4 +1,4 @@ INCLUDE(BuildPlugin) INCLUDE_DIRECTORIES(${STK_INCLUDE_DIR}) LINK_LIBRARIES(${STK_LIBRARY}) -BUILD_PLUGIN(malletsstk mallets.cpp mallets.h MOCFILES mallets.h EMBEDDED_RESOURCES *.png) +BUILD_PLUGIN(malletsstk mallets.cpp mallets.h MOCFILES mallets.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) diff --git a/plugins/triple_oscillator/CMakeLists.txt b/plugins/triple_oscillator/CMakeLists.txt index 1eafeb082..59554bedc 100644 --- a/plugins/triple_oscillator/CMakeLists.txt +++ b/plugins/triple_oscillator/CMakeLists.txt @@ -1,3 +1,3 @@ INCLUDE(BuildPlugin) -BUILD_PLUGIN(tripleoscillator triple_oscillator.cpp triple_oscillator.h MOCFILES triple_oscillator.h EMBEDDED_RESOURCES *.png) +BUILD_PLUGIN(tripleoscillator triple_oscillator.cpp triple_oscillator.h MOCFILES triple_oscillator.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) diff --git a/plugins/vestige/CMakeLists.txt b/plugins/vestige/CMakeLists.txt index 3af759e7e..40e4aad22 100644 --- a/plugins/vestige/CMakeLists.txt +++ b/plugins/vestige/CMakeLists.txt @@ -5,7 +5,7 @@ INCLUDE_DIRECTORIES(../vst_base) LINK_DIRECTORIES(../vst_base) LINK_LIBRARIES(vstbase) -BUILD_PLUGIN(vestige vestige.cpp vestige.h MOCFILES vestige.h EMBEDDED_RESOURCES *.png) +BUILD_PLUGIN(vestige vestige.cpp vestige.h MOCFILES vestige.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) SET_TARGET_PROPERTIES(vestige PROPERTIES COMPILE_FLAGS "-D_FORTIFY_SOURCE=0") ENDIF(LMMS_HAVE_VST) diff --git a/plugins/vibed/CMakeLists.txt b/plugins/vibed/CMakeLists.txt index b0e812d80..397e9a624 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 *.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_effect/CMakeLists.txt b/plugins/vst_effect/CMakeLists.txt index 91e49b48b..bbf262edd 100644 --- a/plugins/vst_effect/CMakeLists.txt +++ b/plugins/vst_effect/CMakeLists.txt @@ -5,7 +5,7 @@ INCLUDE_DIRECTORIES(../vst_base) LINK_DIRECTORIES(../vst_base) LINK_LIBRARIES(vstbase) -BUILD_PLUGIN(vsteffect vst_effect.cpp vst_effect_controls.cpp vst_effect_control_dialog.cpp vst_subplugin_features.cpp vst_effect.h vst_effect_controls.h vst_effect_control_dialog.h vst_subplugin_features.h MOCFILES vst_effect_controls.h EMBEDDED_RESOURCES *.png) +BUILD_PLUGIN(vsteffect vst_effect.cpp vst_effect_controls.cpp vst_effect_control_dialog.cpp vst_subplugin_features.cpp vst_effect.h vst_effect_controls.h vst_effect_control_dialog.h vst_subplugin_features.h MOCFILES vst_effect_controls.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) SET_TARGET_PROPERTIES(vsteffect PROPERTIES COMPILE_FLAGS "-Wno-attributes")