From 0bb0cb79f3f10a8fe9ada5a2ba92d6e12bc7626a Mon Sep 17 00:00:00 2001 From: Owen Green Date: Sat, 14 Mar 2020 12:15:40 +0000 Subject: [PATCH] Don't use source directory for staging built plugins in superbuild (they all overwrite each other) --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b066595..2847d1a 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,9 +65,13 @@ if(NOT fluid_decomposition_POPULATED) FetchContent_Populate(fluid_decomposition) add_subdirectory(${fluid_decomposition_SOURCE_DIR} ${fluid_decomposition_BINARY_DIR}) include(flucoma_version) + include(flucoma-buildtools) endif() -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SC_LIBRARY_OUTPUT_PREFIX}/plugins") +set_if_toplevel(VAR CMAKE_LIBRARY_OUTPUT_DIRECTORY + TOPLEVEL "${CMAKE_CURRENT_SOURCE_DIR}/${SC_LIBRARY_OUTPUT_PREFIX}/plugins" + SUPERBUILD "${CMAKE_SOURCE_DIR}/sc_plugins/${CMAKE_HOST_SYSTEM_NAME}/${CMAKE_HOST_SYSTEM_PROCESSOR}") + 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 "") @@ -111,7 +115,7 @@ foreach(PACKAGE_DIRECTORY Classes;HelpSource;ignore) install(DIRECTORY "release-packaging/${PACKAGE_DIRECTORY}" DESTINATION ${SC_PACKAGE_ROOT}) endforeach() -install(DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} DESTINATION ${SC_PACKAGE_ROOT} PATTERN "*.ilk" EXCLUDE PATTERN "*.PDB" EXCLUDE) +install(DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/ DESTINATION ${SC_PACKAGE_ROOT}/plugins PATTERN "*.ilk" EXCLUDE PATTERN "*.PDB" EXCLUDE) install(DIRECTORY "${fluid_decomposition_SOURCE_DIR}/AudioFiles" DESTINATION ${SC_PACKAGE_ROOT}) install(FILES QuickStart.md DESTINATION ${SC_PACKAGE_ROOT}) install(FILES ${fluid_decomposition_SOURCE_DIR}/license-executableform.md DESTINATION ${SC_PACKAGE_ROOT} RENAME license.md)