From 465dab6a820ff468aa53bb6e7db820a280e53792 Mon Sep 17 00:00:00 2001 From: Owen Green Date: Fri, 16 Aug 2019 09:58:32 +0100 Subject: [PATCH 1/8] CmakeLists / target_post.cmake: switch to using CMake Fetch for Fluid dependencies. Same syntax is possible, but will fall back to git clone in the absence of supplied cache args --- CMakeLists.txt | 77 +++++++++++++++++++++++---------------- scripts/target_post.cmake | 21 ++++++----- 2 files changed, 58 insertions(+), 40 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 71c94fb..ab86488 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,28 +29,60 @@ MACRO(SUBDIRLIST result curdir) SET(${result} ${dirlist}) ENDMACRO() -set(FLUID_PATH ~/fluid_decomposition CACHE PATH "The top level of the fluid_decomposition repo") -set(LOCAL_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/include") +include(FetchContent) + +set(FETCHCONTENT_QUIET FALSE) + +if(DEFINED FLUID_PATH) +get_filename_component(FLUID_PATH ${FLUID_PATH} ABSOLUTE) +message(${FLUID_PATH}) +FetchContent_Declare( + fluid_decomposition + # URL ${FLUID_PATH} + DOWNLOAD_COMMAND "" + SOURCE_DIR "${FLUID_PATH}/" +) +else() +FetchContent_Declare( + fluid_decomposition + GIT_REPOSITORY https://bitbucket.org/flucoma/fluid_decomposition.git + GIT_PROGRESS TRUE +) +endif() +if(DEFINED FLUID_M_PATH) +get_filename_component(FLUID_M_PATH ${FLUID_M_PATH} ABSOLUTE) +FetchContent_Declare( + fluid_manipulation + # URL ${FLUID_M_PATH} + DOWNLOAD_COMMAND "" + SOURCE_DIR "${FLUID_M_PATH}/" +) +else() +FetchContent_Declare( + fluid_manipulation + GIT_REPOSITORY https://bitbucket.org/flucoma/fluid_manipulation.git + GIT_PROGRESS TRUE +) +endif() -get_filename_component(FLUID_ABS_PATH "${FLUID_PATH}" ABSOLUTE) -message("${FLUID_ABS_PATH}") -# if (NOT DEFINED ${FLUID_DECOMP_PATH}) -# message(FATAL_ERROR "Please set the path to the fluid_decomposition sources with -DFLUID_DECOMP_PATH=") -# endif() +FetchContent_GetProperties(fluid_decomposition) +if(NOT fluid_decomposition_POPULATED) + FetchContent_Populate(fluid_decomposition) + add_subdirectory(${fluid_decomposition_SOURCE_DIR} ${fluid_decomposition_BINARY_DIR}) +endif() -if (NOT (EXISTS "${FLUID_ABS_PATH}/build/fluid_decomposition-exports.cmake")) - message(FATAL_ERROR "Can't find the fluid_decomposition CMake targets file at ${FLUID_ABS_PATH}/build/fluid_decomposition-exports.cmake. Please go to ${FLUID_ABS_PATH}/build and run CMake") +FetchContent_GetProperties(fluid_manipulation) +if(NOT fluid_manipulation_POPULATED) + FetchContent_Populate(fluid_manipulation) + add_subdirectory(${fluid_manipulation_SOURCE_DIR} ${fluid_manipulation_BINARY_DIR}) endif() if (NOT (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/release-packaging/AudioFiles/")) file(MAKE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/release-packaging/AudioFiles/") endif() -file(COPY "${FLUID_ABS_PATH}/AudioFiles/" DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/release-packaging/AudioFiles/") - - -include("${FLUID_ABS_PATH}/build/fluid_decomposition-exports.cmake") +file(COPY "${fluid_decomposition_SOURCE_DIR}/AudioFiles/" DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/release-packaging/AudioFiles/") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/release-packaging/plugins") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") @@ -61,26 +93,9 @@ if(APPLE OR WIN32) set(CMAKE_SHARED_MODULE_SUFFIX ".scx") endif() -get_property(FFT_SOURCES TARGET HISSTools_FFT PROPERTY INTERFACE_SOURCES) -get_property(FFT_LINK TARGET HISSTools_FFT PROPERTY INTERFACE_LINK_LIBRARIES) - -add_library(FFTLIB STATIC ${FFT_SOURCES}) -target_link_libraries( - FFTLIB PRIVATE ${FFT_LINK} -) -if(WIN32) - target_compile_options( - FFTLIB PRIVATE $<$>: /arch:AVX> - ) -else(WIN32) -target_compile_options( - FFTLIB PRIVATE $<$>: -mavx -msse -msse2 -msse3 -msse4> -) -endif(WIN32) - #needed for complaint-free static linking with GCC if(CMAKE_COMPILER_IS_GNUCXX) -target_compile_options( FFTLIB PUBLIC -fPIC ) +target_compile_options( HISSTools_FFT PUBLIC -fPIC ) ENDIF(CMAKE_COMPILER_IS_GNUCXX) add_library(FLUID_SC_WRAPPER INTERFACE) diff --git a/scripts/target_post.cmake b/scripts/target_post.cmake index 2ce587f..f6a4c44 100644 --- a/scripts/target_post.cmake +++ b/scripts/target_post.cmake @@ -17,9 +17,10 @@ target_link_libraries( ${PLUGIN} PUBLIC FLUID_DECOMPOSITION + FLUID_MANIP FLUID_SC_WRAPPER PRIVATE - FFTLIB + HISSTools_FFT ) @@ -39,8 +40,10 @@ target_include_directories( ) get_property(HEADERS TARGET FLUID_DECOMPOSITION PROPERTY INTERFACE_SOURCES) -source_group(TREE "${FLUID_PATH}/include" FILES ${HEADERS}) +source_group(TREE "${fluid_decomposition_SOURCE_DIR}/include" FILES ${HEADERS}) +get_property(HEADERS TARGET FLUID_MANIP PROPERTY INTERFACE_SOURCES) +source_group(TREE "${fluid_manipulation_SOURCE_DIR}/include" FILES ${HEADERS}) if (SUPERNOVA) target_include_directories( @@ -66,7 +69,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG) target_compile_options( ${PLUGIN} PRIVATE - $<$>: -mavx -msse -msse2 -msse3 -msse4> + $<$>: -mavx> ) endif() @@ -81,14 +84,14 @@ if(MSVC) target_compile_options(${PLUGIN} PRIVATE /arch:AVX -D_USE_MATH_DEFINES) else(MSVC) target_compile_options( - ${PLUGIN} PRIVATE $<$>: -mavx -msse -msse2 -msse3 -msse4> + ${PLUGIN} PRIVATE $<$>: -mavx> ) endif(MSVC) ####### added the fluid_decomposition -if(SUPERNOVA) - add_library(${PLUGIN}_supernova MODULE ${FILENAME}) - set_property(TARGET ${PROJECT}_supernova - PROPERTY COMPILE_DEFINITIONS SUPERNOVA) -endif() +# if(SUPERNOVA) +# add_library(${PLUGIN}_supernova MODULE ${FILENAME}) +# set_property(TARGET ${PROJECT}_supernova +# PROPERTY COMPILE_DEFINITIONS SUPERNOVA) +# endif() From d6fe4f705a99b0335c93e6ce6736bb0b9159f751 Mon Sep 17 00:00:00 2001 From: Owen Green Date: Wed, 11 Dec 2019 17:42:08 +0000 Subject: [PATCH 2/8] Update subprojects' minimum CMake to 3.11 --- src/FluidAmpSlice/CMakeLists.txt | 2 +- src/FluidBufAmpSlice/CMakeLists.txt | 2 +- src/FluidBufCompose/CMakeLists.txt | 2 +- src/FluidBufHPSS/CMakeLists.txt | 2 +- src/FluidBufLoudness/CMakeLists.txt | 2 +- src/FluidBufMFCC/CMakeLists.txt | 2 +- src/FluidBufMelBands/CMakeLists.txt | 2 +- src/FluidBufNMF/CMakeLists.txt | 2 +- src/FluidBufNoveltySlice/CMakeLists.txt | 2 +- src/FluidBufOnsetSlice/CMakeLists.txt | 2 +- src/FluidBufPitch/CMakeLists.txt | 2 +- src/FluidBufSines/CMakeLists.txt | 2 +- src/FluidBufSpectralShape/CMakeLists.txt | 2 +- src/FluidBufStats/CMakeLists.txt | 2 +- src/FluidBufThreadDemo/CMakeLists.txt | 2 +- src/FluidBufTransientSlice/CMakeLists.txt | 2 +- src/FluidBufTransients/CMakeLists.txt | 2 +- src/FluidGain/CMakeLists.txt | 2 +- src/FluidHPSS/CMakeLists.txt | 2 +- src/FluidLoudness/CMakeLists.txt | 2 +- src/FluidMFCC/CMakeLists.txt | 2 +- src/FluidMelBands/CMakeLists.txt | 2 +- src/FluidNMFFilter/CMakeLists.txt | 2 +- src/FluidNMFMatch/CMakeLists.txt | 2 +- src/FluidNoveltySlice/CMakeLists.txt | 2 +- src/FluidOnsetSlice/CMakeLists.txt | 2 +- src/FluidPitch/CMakeLists.txt | 2 +- src/FluidSTFTPass/CMakeLists.txt | 2 +- src/FluidSines/CMakeLists.txt | 2 +- src/FluidSpectralShape/CMakeLists.txt | 2 +- src/FluidTransientSlice/CMakeLists.txt | 2 +- src/FluidTransients/CMakeLists.txt | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/FluidAmpSlice/CMakeLists.txt b/src/FluidAmpSlice/CMakeLists.txt index 3693881..ee75433 100644 --- a/src/FluidAmpSlice/CMakeLists.txt +++ b/src/FluidAmpSlice/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidBufAmpSlice/CMakeLists.txt b/src/FluidBufAmpSlice/CMakeLists.txt index 3693881..ee75433 100644 --- a/src/FluidBufAmpSlice/CMakeLists.txt +++ b/src/FluidBufAmpSlice/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidBufCompose/CMakeLists.txt b/src/FluidBufCompose/CMakeLists.txt index 3693881..ee75433 100755 --- a/src/FluidBufCompose/CMakeLists.txt +++ b/src/FluidBufCompose/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidBufHPSS/CMakeLists.txt b/src/FluidBufHPSS/CMakeLists.txt index 3693881..ee75433 100755 --- a/src/FluidBufHPSS/CMakeLists.txt +++ b/src/FluidBufHPSS/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidBufLoudness/CMakeLists.txt b/src/FluidBufLoudness/CMakeLists.txt index 3693881..ee75433 100644 --- a/src/FluidBufLoudness/CMakeLists.txt +++ b/src/FluidBufLoudness/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidBufMFCC/CMakeLists.txt b/src/FluidBufMFCC/CMakeLists.txt index 3693881..ee75433 100644 --- a/src/FluidBufMFCC/CMakeLists.txt +++ b/src/FluidBufMFCC/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidBufMelBands/CMakeLists.txt b/src/FluidBufMelBands/CMakeLists.txt index 3693881..ee75433 100644 --- a/src/FluidBufMelBands/CMakeLists.txt +++ b/src/FluidBufMelBands/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidBufNMF/CMakeLists.txt b/src/FluidBufNMF/CMakeLists.txt index 3693881..ee75433 100755 --- a/src/FluidBufNMF/CMakeLists.txt +++ b/src/FluidBufNMF/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidBufNoveltySlice/CMakeLists.txt b/src/FluidBufNoveltySlice/CMakeLists.txt index 3693881..ee75433 100644 --- a/src/FluidBufNoveltySlice/CMakeLists.txt +++ b/src/FluidBufNoveltySlice/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidBufOnsetSlice/CMakeLists.txt b/src/FluidBufOnsetSlice/CMakeLists.txt index 3693881..ee75433 100644 --- a/src/FluidBufOnsetSlice/CMakeLists.txt +++ b/src/FluidBufOnsetSlice/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidBufPitch/CMakeLists.txt b/src/FluidBufPitch/CMakeLists.txt index 3693881..ee75433 100644 --- a/src/FluidBufPitch/CMakeLists.txt +++ b/src/FluidBufPitch/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidBufSines/CMakeLists.txt b/src/FluidBufSines/CMakeLists.txt index 3693881..ee75433 100755 --- a/src/FluidBufSines/CMakeLists.txt +++ b/src/FluidBufSines/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidBufSpectralShape/CMakeLists.txt b/src/FluidBufSpectralShape/CMakeLists.txt index 3693881..ee75433 100755 --- a/src/FluidBufSpectralShape/CMakeLists.txt +++ b/src/FluidBufSpectralShape/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidBufStats/CMakeLists.txt b/src/FluidBufStats/CMakeLists.txt index 3693881..ee75433 100644 --- a/src/FluidBufStats/CMakeLists.txt +++ b/src/FluidBufStats/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidBufThreadDemo/CMakeLists.txt b/src/FluidBufThreadDemo/CMakeLists.txt index 3693881..ee75433 100644 --- a/src/FluidBufThreadDemo/CMakeLists.txt +++ b/src/FluidBufThreadDemo/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidBufTransientSlice/CMakeLists.txt b/src/FluidBufTransientSlice/CMakeLists.txt index 3693881..ee75433 100755 --- a/src/FluidBufTransientSlice/CMakeLists.txt +++ b/src/FluidBufTransientSlice/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidBufTransients/CMakeLists.txt b/src/FluidBufTransients/CMakeLists.txt index 3693881..ee75433 100755 --- a/src/FluidBufTransients/CMakeLists.txt +++ b/src/FluidBufTransients/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidGain/CMakeLists.txt b/src/FluidGain/CMakeLists.txt index 4f27137..5c24cc5 100755 --- a/src/FluidGain/CMakeLists.txt +++ b/src/FluidGain/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidHPSS/CMakeLists.txt b/src/FluidHPSS/CMakeLists.txt index 3693881..ee75433 100755 --- a/src/FluidHPSS/CMakeLists.txt +++ b/src/FluidHPSS/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidLoudness/CMakeLists.txt b/src/FluidLoudness/CMakeLists.txt index 3693881..ee75433 100644 --- a/src/FluidLoudness/CMakeLists.txt +++ b/src/FluidLoudness/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidMFCC/CMakeLists.txt b/src/FluidMFCC/CMakeLists.txt index 3693881..ee75433 100644 --- a/src/FluidMFCC/CMakeLists.txt +++ b/src/FluidMFCC/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidMelBands/CMakeLists.txt b/src/FluidMelBands/CMakeLists.txt index 3693881..ee75433 100644 --- a/src/FluidMelBands/CMakeLists.txt +++ b/src/FluidMelBands/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidNMFFilter/CMakeLists.txt b/src/FluidNMFFilter/CMakeLists.txt index 3693881..ee75433 100644 --- a/src/FluidNMFFilter/CMakeLists.txt +++ b/src/FluidNMFFilter/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidNMFMatch/CMakeLists.txt b/src/FluidNMFMatch/CMakeLists.txt index 3693881..ee75433 100755 --- a/src/FluidNMFMatch/CMakeLists.txt +++ b/src/FluidNMFMatch/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidNoveltySlice/CMakeLists.txt b/src/FluidNoveltySlice/CMakeLists.txt index 3693881..ee75433 100644 --- a/src/FluidNoveltySlice/CMakeLists.txt +++ b/src/FluidNoveltySlice/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidOnsetSlice/CMakeLists.txt b/src/FluidOnsetSlice/CMakeLists.txt index 3693881..ee75433 100644 --- a/src/FluidOnsetSlice/CMakeLists.txt +++ b/src/FluidOnsetSlice/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidPitch/CMakeLists.txt b/src/FluidPitch/CMakeLists.txt index 3693881..ee75433 100644 --- a/src/FluidPitch/CMakeLists.txt +++ b/src/FluidPitch/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidSTFTPass/CMakeLists.txt b/src/FluidSTFTPass/CMakeLists.txt index 3693881..ee75433 100755 --- a/src/FluidSTFTPass/CMakeLists.txt +++ b/src/FluidSTFTPass/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidSines/CMakeLists.txt b/src/FluidSines/CMakeLists.txt index 3693881..ee75433 100755 --- a/src/FluidSines/CMakeLists.txt +++ b/src/FluidSines/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidSpectralShape/CMakeLists.txt b/src/FluidSpectralShape/CMakeLists.txt index 3693881..ee75433 100644 --- a/src/FluidSpectralShape/CMakeLists.txt +++ b/src/FluidSpectralShape/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidTransientSlice/CMakeLists.txt b/src/FluidTransientSlice/CMakeLists.txt index 3693881..ee75433 100755 --- a/src/FluidTransientSlice/CMakeLists.txt +++ b/src/FluidTransientSlice/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) diff --git a/src/FluidTransients/CMakeLists.txt b/src/FluidTransients/CMakeLists.txt index d1e5005..01d2f6a 100755 --- a/src/FluidTransients/CMakeLists.txt +++ b/src/FluidTransients/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) message("Configuring ${PLUGIN}") set(FILENAME ${PLUGIN}.cpp) From 3904590dbffa7c951f47c7df79e062a0d1496cc0 Mon Sep 17 00:00:00 2001 From: Owen Green Date: Wed, 11 Dec 2019 21:54:33 +0000 Subject: [PATCH 3/8] Set CMake up for FetchContent --- CMakeLists.txt | 106 +++++++++++++++++--------------------- scripts/target_post.cmake | 78 +++++++++------------------- 2 files changed, 72 insertions(+), 112 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ab86488..a8590ec 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,22 +1,29 @@ -####### original SC Cmake file starts here -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.11) +################################################################################ +# Paths +set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/release-packaging") +set(MAX_TARGET_NAMESPACE "" CACHE STRING "Optional namesapce to prepend to targets to prevent collision in super-builds") -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_CXX_STANDARD 14) -set(CMAKE_CXX_EXTENSIONS OFF) -if(APPLE) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -mavx -msse -msse2 -msse3 -msse4") -set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -stdlib=libc++") -SET(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++") -set(CMAKE_OSX_DEPLOYMENT_TARGET "10.7" CACHE STRING "Minimum OS X deployment version") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic") +set(SC_PATH "" CACHE PATH "Path to the top of SuperCollider source tree") +if(NOT SC_PATH) + message(FATAL_ERROR "SuperCollider source path is not set") endif() -project (fluid_decomposition_supercollider LANGUAGES CXX) +set(FLUID_PATH "" CACHE PATH "Optional path to the Fluid Decomposition repo") +# set(FLUID_M_PATH "" CACHE PATH "Optional path to the Fluid fluid_manipulation repo") + +if (APPLE) + set(CMAKE_OSX_ARCHITECTURES x86_64) + set(CMAKE_XCODE_GENERATE_SCHEME ON) +endif() -option(SUPERNOVA "Build plugins for supernova" OFF) +################################################################################ +# Main project +project (fluid_decomposition_supercollider LANGUAGES CXX) +set_property(GLOBAL PROPERTY USE_FOLDERS ON) +set(CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY ON) MACRO(SUBDIRLIST result curdir) FILE(GLOB children RELATIVE ${curdir} ${curdir}/*) @@ -33,37 +40,16 @@ include(FetchContent) set(FETCHCONTENT_QUIET FALSE) -if(DEFINED FLUID_PATH) -get_filename_component(FLUID_PATH ${FLUID_PATH} ABSOLUTE) -message(${FLUID_PATH}) -FetchContent_Declare( - fluid_decomposition - # URL ${FLUID_PATH} - DOWNLOAD_COMMAND "" - SOURCE_DIR "${FLUID_PATH}/" -) -else() FetchContent_Declare( fluid_decomposition GIT_REPOSITORY https://bitbucket.org/flucoma/fluid_decomposition.git GIT_PROGRESS TRUE ) -endif() -if(DEFINED FLUID_M_PATH) -get_filename_component(FLUID_M_PATH ${FLUID_M_PATH} ABSOLUTE) -FetchContent_Declare( - fluid_manipulation - # URL ${FLUID_M_PATH} - DOWNLOAD_COMMAND "" - SOURCE_DIR "${FLUID_M_PATH}/" -) -else() -FetchContent_Declare( - fluid_manipulation - GIT_REPOSITORY https://bitbucket.org/flucoma/fluid_manipulation.git - GIT_PROGRESS TRUE -) +if(FLUID_PATH) + get_filename_component( + FETCHCONTENT_SOURCE_DIR_FLUID_DECOMPOSITION ${FLUID_PATH} ABSOLUTE + ) endif() FetchContent_GetProperties(fluid_decomposition) @@ -72,37 +58,25 @@ if(NOT fluid_decomposition_POPULATED) add_subdirectory(${fluid_decomposition_SOURCE_DIR} ${fluid_decomposition_BINARY_DIR}) endif() -FetchContent_GetProperties(fluid_manipulation) -if(NOT fluid_manipulation_POPULATED) - FetchContent_Populate(fluid_manipulation) - add_subdirectory(${fluid_manipulation_SOURCE_DIR} ${fluid_manipulation_BINARY_DIR}) -endif() - -if (NOT (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/release-packaging/AudioFiles/")) - file(MAKE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/release-packaging/AudioFiles/") -endif() - -file(COPY "${fluid_decomposition_SOURCE_DIR}/AudioFiles/" DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/release-packaging/AudioFiles/") - -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/release-packaging/plugins") +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_SYSTEM_NAME}/plugins") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") - set(CMAKE_SHARED_MODULE_PREFIX "") + if(APPLE OR WIN32) -set(CMAKE_SHARED_MODULE_SUFFIX ".scx") + set(CMAKE_SHARED_MODULE_SUFFIX ".scx") endif() #needed for complaint-free static linking with GCC if(CMAKE_COMPILER_IS_GNUCXX) -target_compile_options( HISSTools_FFT PUBLIC -fPIC ) -ENDIF(CMAKE_COMPILER_IS_GNUCXX) + target_compile_options( HISSTools_FFT PUBLIC -fPIC ) +ENDIF() add_library(FLUID_SC_WRAPPER INTERFACE) -target_sources(FLUID_SC_WRAPPER -INTERFACE -"${CMAKE_CURRENT_SOURCE_DIR}/include/FluidSCWrapper.hpp" -"${CMAKE_CURRENT_SOURCE_DIR}/include/SCBufferAdaptor.hpp" +target_sources(FLUID_SC_WRAPPER + INTERFACE + "${CMAKE_CURRENT_SOURCE_DIR}/include/FluidSCWrapper.hpp" + "${CMAKE_CURRENT_SOURCE_DIR}/include/SCBufferAdaptor.hpp" ) SUBDIRLIST(PROJECT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src") @@ -112,3 +86,17 @@ foreach (project_dir ${PROJECT_DIRS}) add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/${project_dir}") endif () endforeach () + +#install bits. + +set(SC_INSTALL_PREFIX "." CACHE PATH "Prefix for assembling PD packages") +set(FLUID_PACKAGE_NAME FluidCorpusManipulation CACHE STRING "Name for published package") +set(SC_PACKAGE_ROOT ${SC_INSTALL_PREFIX}/${FLUID_PACKAGE_NAME}) + +foreach(PACKAGE_DIRECTORY Classes;HelpSource;ignore) + install(DIRECTORY "release-packaging/${PACKAGE_DIRECTORY}" DESTINATION ${SC_PACKAGE_ROOT}) +endforeach() + +install(DIRECTORY CMAKE_LIBRARY_OUTPUT_DIRECTORY DESTINATION plugins PATTERN "*.ilk" EXCLUDE PATTERN "*.PDB" EXCLUDE) +install(DIRECTORY "${fluid_decomposition_SOURCE_DIR}/AudioFiles/" DESTINATION ./AudioFiles) +install(FILES QuickStart.md DESTINATION .) diff --git a/scripts/target_post.cmake b/scripts/target_post.cmake index f6a4c44..1cf8e50 100644 --- a/scripts/target_post.cmake +++ b/scripts/target_post.cmake @@ -1,10 +1,12 @@ -target_compile_features(${PLUGIN} PUBLIC cxx_std_14) +target_compile_features(${PLUGIN} PRIVATE cxx_std_14) if(MSVC) - target_compile_options(${PLUGIN} PRIVATE /W4) + target_compile_options(${PLUGIN} PRIVATE /W3) else() - target_compile_options(${PLUGIN} PRIVATE -Wall -Wextra -Wpedantic -Wreturn-type -Wconversion) + target_compile_options(${PLUGIN} PRIVATE + -Wall -Wextra -Wpedantic -Wreturn-type -Wconversion -Wno-conversion -Wno-c++11-narrowing -Wno-sign-compare + ) endif() set_target_properties(${PLUGIN} PROPERTIES @@ -15,15 +17,13 @@ set_target_properties(${PLUGIN} PROPERTIES target_link_libraries( ${PLUGIN} - PUBLIC - FLUID_DECOMPOSITION - FLUID_MANIP - FLUID_SC_WRAPPER PRIVATE + FLUID_DECOMPOSITION + # FLUID_MANIP + FLUID_SC_WRAPPER HISSTools_FFT ) - target_include_directories( ${PLUGIN} PRIVATE @@ -42,38 +42,18 @@ target_include_directories( get_property(HEADERS TARGET FLUID_DECOMPOSITION PROPERTY INTERFACE_SOURCES) source_group(TREE "${fluid_decomposition_SOURCE_DIR}/include" FILES ${HEADERS}) -get_property(HEADERS TARGET FLUID_MANIP PROPERTY INTERFACE_SOURCES) -source_group(TREE "${fluid_manipulation_SOURCE_DIR}/include" FILES ${HEADERS}) - -if (SUPERNOVA) - target_include_directories( - ${PLUGIN} - SYSTEM PRIVATE - "${SC_PATH}/external_libraries/nova-tt" - "${SC_PATH}/external_libraries/boost_lockfree" - "${SC_PATH}/external_libraries/boost-lockfree" - ) -endif() - -if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG) - target_compile_options(${PLUGIN} PRIVATE -fvisibility=hidden) - - include (CheckCXXCompilerFlag) - - # CHECK_CXX_COMPILER_FLAG(-msse HAS_CXX_SSE) - # CHECK_CXX_COMPILER_FLAG(-msse2 HAS_CXX_SSE2) - # CHECK_CXX_COMPILER_FLAG(-mfpmath=sse HAS_CXX_FPMATH_SSE) - # CHECK_CXX_COMPILER_FLAG(-mavx HAS_AVX) - # CHECK_CXX_COMPILER_FLAG(-mavx2 HAS_AVX2) - - target_compile_options( - ${PLUGIN} - PRIVATE - $<$>: -mavx> - ) -endif() - - +# get_property(HEADERS TARGET FLUID_MANIP PROPERTY INTERFACE_SOURCES) +# source_group(TREE "${fluid_manipulation_SOURCE_DIR}/include" FILES ${HEADERS}) +# +# if (SUPERNOVA) +# target_include_directories( +# ${PLUGIN} +# SYSTEM PRIVATE +# "${SC_PATH}/external_libraries/nova-tt" +# "${SC_PATH}/external_libraries/boost_lockfree" +# "${SC_PATH}/external_libraries/boost-lockfree" +# ) +# endif() if(MINGW) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mstackrealign") @@ -82,16 +62,8 @@ endif() if(MSVC) target_compile_options(${PLUGIN} PRIVATE /arch:AVX -D_USE_MATH_DEFINES) -else(MSVC) -target_compile_options( - ${PLUGIN} PRIVATE $<$>: -mavx> -) -endif(MSVC) - -####### added the fluid_decomposition - -# if(SUPERNOVA) -# add_library(${PLUGIN}_supernova MODULE ${FILENAME}) -# set_property(TARGET ${PROJECT}_supernova -# PROPERTY COMPILE_DEFINITIONS SUPERNOVA) -# endif() +else() + target_compile_options( + ${PLUGIN} PRIVATE $<$>: -mavx> -fvisibility=hidden + ) +endif() From aaf43cbf68f4853b75c137fc81c3d66756fe9cd0 Mon Sep 17 00:00:00 2001 From: Owen Green Date: Wed, 11 Dec 2019 22:46:00 +0000 Subject: [PATCH 4/8] Remove noise from subproject CMakeLists --- src/FluidAmpSlice/CMakeLists.txt | 8 -------- src/FluidBufAmpSlice/CMakeLists.txt | 8 -------- src/FluidBufCompose/CMakeLists.txt | 8 -------- src/FluidBufHPSS/CMakeLists.txt | 8 -------- src/FluidBufLoudness/CMakeLists.txt | 8 -------- src/FluidBufMFCC/CMakeLists.txt | 8 -------- src/FluidBufMelBands/CMakeLists.txt | 8 -------- src/FluidBufNMF/CMakeLists.txt | 8 -------- src/FluidBufNoveltySlice/CMakeLists.txt | 8 -------- src/FluidBufOnsetSlice/CMakeLists.txt | 8 -------- src/FluidBufPitch/CMakeLists.txt | 7 ------- src/FluidBufSines/CMakeLists.txt | 8 -------- src/FluidBufSpectralShape/CMakeLists.txt | 8 -------- src/FluidBufStats/CMakeLists.txt | 8 -------- src/FluidBufThreadDemo/CMakeLists.txt | 8 -------- src/FluidBufTransientSlice/CMakeLists.txt | 8 -------- src/FluidBufTransients/CMakeLists.txt | 7 ------- src/FluidGain/CMakeLists.txt | 8 -------- src/FluidHPSS/CMakeLists.txt | 8 -------- src/FluidLoudness/CMakeLists.txt | 8 -------- src/FluidMFCC/CMakeLists.txt | 8 -------- src/FluidMelBands/CMakeLists.txt | 8 -------- src/FluidNMFFilter/CMakeLists.txt | 8 -------- src/FluidNMFMatch/CMakeLists.txt | 8 -------- src/FluidNoveltySlice/CMakeLists.txt | 8 -------- src/FluidOnsetSlice/CMakeLists.txt | 8 -------- src/FluidPitch/CMakeLists.txt | 7 ------- src/FluidSTFTPass/CMakeLists.txt | 7 ------- src/FluidSines/CMakeLists.txt | 7 ------- src/FluidSpectralShape/CMakeLists.txt | 8 -------- src/FluidTransientSlice/CMakeLists.txt | 8 -------- 31 files changed, 243 deletions(-) diff --git a/src/FluidAmpSlice/CMakeLists.txt b/src/FluidAmpSlice/CMakeLists.txt index ee75433..01d2f6a 100644 --- a/src/FluidAmpSlice/CMakeLists.txt +++ b/src/FluidAmpSlice/CMakeLists.txt @@ -9,12 +9,4 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) - include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidBufAmpSlice/CMakeLists.txt b/src/FluidBufAmpSlice/CMakeLists.txt index ee75433..01d2f6a 100644 --- a/src/FluidBufAmpSlice/CMakeLists.txt +++ b/src/FluidBufAmpSlice/CMakeLists.txt @@ -9,12 +9,4 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) - include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidBufCompose/CMakeLists.txt b/src/FluidBufCompose/CMakeLists.txt index ee75433..01d2f6a 100755 --- a/src/FluidBufCompose/CMakeLists.txt +++ b/src/FluidBufCompose/CMakeLists.txt @@ -9,12 +9,4 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) - include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidBufHPSS/CMakeLists.txt b/src/FluidBufHPSS/CMakeLists.txt index ee75433..01d2f6a 100755 --- a/src/FluidBufHPSS/CMakeLists.txt +++ b/src/FluidBufHPSS/CMakeLists.txt @@ -9,12 +9,4 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) - include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidBufLoudness/CMakeLists.txt b/src/FluidBufLoudness/CMakeLists.txt index ee75433..01d2f6a 100644 --- a/src/FluidBufLoudness/CMakeLists.txt +++ b/src/FluidBufLoudness/CMakeLists.txt @@ -9,12 +9,4 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) - include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidBufMFCC/CMakeLists.txt b/src/FluidBufMFCC/CMakeLists.txt index ee75433..01d2f6a 100644 --- a/src/FluidBufMFCC/CMakeLists.txt +++ b/src/FluidBufMFCC/CMakeLists.txt @@ -9,12 +9,4 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) - include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidBufMelBands/CMakeLists.txt b/src/FluidBufMelBands/CMakeLists.txt index ee75433..01d2f6a 100644 --- a/src/FluidBufMelBands/CMakeLists.txt +++ b/src/FluidBufMelBands/CMakeLists.txt @@ -9,12 +9,4 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) - include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidBufNMF/CMakeLists.txt b/src/FluidBufNMF/CMakeLists.txt index ee75433..01d2f6a 100755 --- a/src/FluidBufNMF/CMakeLists.txt +++ b/src/FluidBufNMF/CMakeLists.txt @@ -9,12 +9,4 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) - include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidBufNoveltySlice/CMakeLists.txt b/src/FluidBufNoveltySlice/CMakeLists.txt index ee75433..01d2f6a 100644 --- a/src/FluidBufNoveltySlice/CMakeLists.txt +++ b/src/FluidBufNoveltySlice/CMakeLists.txt @@ -9,12 +9,4 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) - include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidBufOnsetSlice/CMakeLists.txt b/src/FluidBufOnsetSlice/CMakeLists.txt index ee75433..01d2f6a 100644 --- a/src/FluidBufOnsetSlice/CMakeLists.txt +++ b/src/FluidBufOnsetSlice/CMakeLists.txt @@ -9,12 +9,4 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) - include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidBufPitch/CMakeLists.txt b/src/FluidBufPitch/CMakeLists.txt index ee75433..4c2400a 100644 --- a/src/FluidBufPitch/CMakeLists.txt +++ b/src/FluidBufPitch/CMakeLists.txt @@ -9,12 +9,5 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidBufSines/CMakeLists.txt b/src/FluidBufSines/CMakeLists.txt index ee75433..01d2f6a 100755 --- a/src/FluidBufSines/CMakeLists.txt +++ b/src/FluidBufSines/CMakeLists.txt @@ -9,12 +9,4 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) - include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidBufSpectralShape/CMakeLists.txt b/src/FluidBufSpectralShape/CMakeLists.txt index ee75433..01d2f6a 100755 --- a/src/FluidBufSpectralShape/CMakeLists.txt +++ b/src/FluidBufSpectralShape/CMakeLists.txt @@ -9,12 +9,4 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) - include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidBufStats/CMakeLists.txt b/src/FluidBufStats/CMakeLists.txt index ee75433..01d2f6a 100644 --- a/src/FluidBufStats/CMakeLists.txt +++ b/src/FluidBufStats/CMakeLists.txt @@ -9,12 +9,4 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) - include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidBufThreadDemo/CMakeLists.txt b/src/FluidBufThreadDemo/CMakeLists.txt index ee75433..01d2f6a 100644 --- a/src/FluidBufThreadDemo/CMakeLists.txt +++ b/src/FluidBufThreadDemo/CMakeLists.txt @@ -9,12 +9,4 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) - include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidBufTransientSlice/CMakeLists.txt b/src/FluidBufTransientSlice/CMakeLists.txt index ee75433..01d2f6a 100755 --- a/src/FluidBufTransientSlice/CMakeLists.txt +++ b/src/FluidBufTransientSlice/CMakeLists.txt @@ -9,12 +9,4 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) - include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidBufTransients/CMakeLists.txt b/src/FluidBufTransients/CMakeLists.txt index ee75433..4c2400a 100755 --- a/src/FluidBufTransients/CMakeLists.txt +++ b/src/FluidBufTransients/CMakeLists.txt @@ -9,12 +9,5 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidGain/CMakeLists.txt b/src/FluidGain/CMakeLists.txt index 5c24cc5..01d2f6a 100755 --- a/src/FluidGain/CMakeLists.txt +++ b/src/FluidGain/CMakeLists.txt @@ -9,12 +9,4 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION FLUID_SC_WRAPPER -) - include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidHPSS/CMakeLists.txt b/src/FluidHPSS/CMakeLists.txt index ee75433..01d2f6a 100755 --- a/src/FluidHPSS/CMakeLists.txt +++ b/src/FluidHPSS/CMakeLists.txt @@ -9,12 +9,4 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) - include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidLoudness/CMakeLists.txt b/src/FluidLoudness/CMakeLists.txt index ee75433..01d2f6a 100644 --- a/src/FluidLoudness/CMakeLists.txt +++ b/src/FluidLoudness/CMakeLists.txt @@ -9,12 +9,4 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) - include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidMFCC/CMakeLists.txt b/src/FluidMFCC/CMakeLists.txt index ee75433..01d2f6a 100644 --- a/src/FluidMFCC/CMakeLists.txt +++ b/src/FluidMFCC/CMakeLists.txt @@ -9,12 +9,4 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) - include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidMelBands/CMakeLists.txt b/src/FluidMelBands/CMakeLists.txt index ee75433..01d2f6a 100644 --- a/src/FluidMelBands/CMakeLists.txt +++ b/src/FluidMelBands/CMakeLists.txt @@ -9,12 +9,4 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) - include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidNMFFilter/CMakeLists.txt b/src/FluidNMFFilter/CMakeLists.txt index ee75433..01d2f6a 100644 --- a/src/FluidNMFFilter/CMakeLists.txt +++ b/src/FluidNMFFilter/CMakeLists.txt @@ -9,12 +9,4 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) - include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidNMFMatch/CMakeLists.txt b/src/FluidNMFMatch/CMakeLists.txt index ee75433..01d2f6a 100755 --- a/src/FluidNMFMatch/CMakeLists.txt +++ b/src/FluidNMFMatch/CMakeLists.txt @@ -9,12 +9,4 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) - include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidNoveltySlice/CMakeLists.txt b/src/FluidNoveltySlice/CMakeLists.txt index ee75433..01d2f6a 100644 --- a/src/FluidNoveltySlice/CMakeLists.txt +++ b/src/FluidNoveltySlice/CMakeLists.txt @@ -9,12 +9,4 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) - include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidOnsetSlice/CMakeLists.txt b/src/FluidOnsetSlice/CMakeLists.txt index ee75433..01d2f6a 100644 --- a/src/FluidOnsetSlice/CMakeLists.txt +++ b/src/FluidOnsetSlice/CMakeLists.txt @@ -9,12 +9,4 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) - include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidPitch/CMakeLists.txt b/src/FluidPitch/CMakeLists.txt index ee75433..4c2400a 100644 --- a/src/FluidPitch/CMakeLists.txt +++ b/src/FluidPitch/CMakeLists.txt @@ -9,12 +9,5 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidSTFTPass/CMakeLists.txt b/src/FluidSTFTPass/CMakeLists.txt index ee75433..4c2400a 100755 --- a/src/FluidSTFTPass/CMakeLists.txt +++ b/src/FluidSTFTPass/CMakeLists.txt @@ -9,12 +9,5 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidSines/CMakeLists.txt b/src/FluidSines/CMakeLists.txt index ee75433..4c2400a 100755 --- a/src/FluidSines/CMakeLists.txt +++ b/src/FluidSines/CMakeLists.txt @@ -9,12 +9,5 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidSpectralShape/CMakeLists.txt b/src/FluidSpectralShape/CMakeLists.txt index ee75433..01d2f6a 100644 --- a/src/FluidSpectralShape/CMakeLists.txt +++ b/src/FluidSpectralShape/CMakeLists.txt @@ -9,12 +9,4 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) - include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidTransientSlice/CMakeLists.txt b/src/FluidTransientSlice/CMakeLists.txt index ee75433..01d2f6a 100755 --- a/src/FluidTransientSlice/CMakeLists.txt +++ b/src/FluidTransientSlice/CMakeLists.txt @@ -9,12 +9,4 @@ add_library( ${FILENAME} ) -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) - include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) From 91c99b94f4ad12604ca81c5cf0e97a9ff4737196 Mon Sep 17 00:00:00 2001 From: Owen Green Date: Wed, 11 Dec 2019 22:46:22 +0000 Subject: [PATCH 5/8] Ensure wrapper is actually included, and a typo --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a8590ec..b3984b2 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,6 +73,11 @@ if(CMAKE_COMPILER_IS_GNUCXX) ENDIF() add_library(FLUID_SC_WRAPPER INTERFACE) +target_include_directories(FLUID_SC_WRAPPER + INTERFACE + "${CMAKE_CURRENT_SOURCE_DIR}/include/" +) + target_sources(FLUID_SC_WRAPPER INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include/FluidSCWrapper.hpp" @@ -89,7 +94,7 @@ endforeach () #install bits. -set(SC_INSTALL_PREFIX "." CACHE PATH "Prefix for assembling PD packages") +set(SC_INSTALL_PREFIX "." CACHE PATH "Prefix for assembling SC packages") set(FLUID_PACKAGE_NAME FluidCorpusManipulation CACHE STRING "Name for published package") set(SC_PACKAGE_ROOT ${SC_INSTALL_PREFIX}/${FLUID_PACKAGE_NAME}) From cbbea3f97111b6dc4a86545721182027c9f0d7a8 Mon Sep 17 00:00:00 2001 From: Owen Green Date: Wed, 11 Dec 2019 23:34:21 +0000 Subject: [PATCH 6/8] That'll be an actual variable then --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b3984b2..e04540d 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,6 +102,6 @@ foreach(PACKAGE_DIRECTORY Classes;HelpSource;ignore) install(DIRECTORY "release-packaging/${PACKAGE_DIRECTORY}" DESTINATION ${SC_PACKAGE_ROOT}) endforeach() -install(DIRECTORY CMAKE_LIBRARY_OUTPUT_DIRECTORY DESTINATION plugins PATTERN "*.ilk" EXCLUDE PATTERN "*.PDB" EXCLUDE) +install(DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} DESTINATION plugins PATTERN "*.ilk" EXCLUDE PATTERN "*.PDB" EXCLUDE) install(DIRECTORY "${fluid_decomposition_SOURCE_DIR}/AudioFiles/" DESTINATION ./AudioFiles) install(FILES QuickStart.md DESTINATION .) From 40b4fe2453c751957cd68bd9ce457805949191c8 Mon Sep 17 00:00:00 2001 From: Owen Green Date: Wed, 11 Dec 2019 23:37:35 +0000 Subject: [PATCH 7/8] Install errors --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e04540d..969cb3c 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,6 +102,6 @@ foreach(PACKAGE_DIRECTORY Classes;HelpSource;ignore) install(DIRECTORY "release-packaging/${PACKAGE_DIRECTORY}" DESTINATION ${SC_PACKAGE_ROOT}) endforeach() -install(DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} DESTINATION plugins PATTERN "*.ilk" EXCLUDE PATTERN "*.PDB" EXCLUDE) -install(DIRECTORY "${fluid_decomposition_SOURCE_DIR}/AudioFiles/" DESTINATION ./AudioFiles) +install(DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} DESTINATION ${SC_PACKAGE_ROOT} PATTERN "*.ilk" EXCLUDE PATTERN "*.PDB" EXCLUDE) +install(DIRECTORY "${fluid_decomposition_SOURCE_DIR}/AudioFiles" DESTINATION ${SC_PACKAGE_ROOT}) install(FILES QuickStart.md DESTINATION .) From cb673d205aace79912901c7ba62b975ce19f8fef Mon Sep 17 00:00:00 2001 From: Owen Green Date: Wed, 11 Dec 2019 23:50:56 +0000 Subject: [PATCH 8/8] and another install mistake --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 969cb3c..677406a 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,4 +104,4 @@ endforeach() install(DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} DESTINATION ${SC_PACKAGE_ROOT} PATTERN "*.ilk" EXCLUDE PATTERN "*.PDB" EXCLUDE) install(DIRECTORY "${fluid_decomposition_SOURCE_DIR}/AudioFiles" DESTINATION ${SC_PACKAGE_ROOT}) -install(FILES QuickStart.md DESTINATION .) +install(FILES QuickStart.md DESTINATION ${SC_PACKAGE_ROOT})