From f0642979f9d098acf35f9e953974ec22cc31f7b8 Mon Sep 17 00:00:00 2001 From: reuk Date: Mon, 4 May 2020 16:12:27 +0100 Subject: [PATCH] CMake: Fix issue with VST, VST3, and Unity targets On Linux, all these target kinds tried to create products with the same name. Now we place each plugin target into a folder named after the plugin kind, which allows each plugin kind to produce artefacts which share names. --- extras/Build/CMake/JUCEUtils.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/extras/Build/CMake/JUCEUtils.cmake b/extras/Build/CMake/JUCEUtils.cmake index 735ef65785..5f7c8060c9 100644 --- a/extras/Build/CMake/JUCEUtils.cmake +++ b/extras/Build/CMake/JUCEUtils.cmake @@ -1088,7 +1088,7 @@ function(_juce_create_windows_package source_target dest_target extension defaul return() endif() - get_target_property(products_folder ${source_target} LIBRARY_OUTPUT_DIRECTORY) + get_target_property(products_folder ${dest_target} LIBRARY_OUTPUT_DIRECTORY) set(product_name $) set(output_folder "${products_folder}/${product_name}.${extension}") @@ -1181,11 +1181,11 @@ function(_juce_set_plugin_target_properties shared_code_target kind) set(target_name ${shared_code_target}_${kind}) set_target_properties(${target_name} PROPERTIES - ARCHIVE_OUTPUT_DIRECTORY "$>" - LIBRARY_OUTPUT_DIRECTORY "$>" - RUNTIME_OUTPUT_DIRECTORY "$>") + ARCHIVE_OUTPUT_DIRECTORY "$>/${kind}" + LIBRARY_OUTPUT_DIRECTORY "$>/${kind}" + RUNTIME_OUTPUT_DIRECTORY "$>/${kind}") - get_target_property(products_folder ${shared_code_target} LIBRARY_OUTPUT_DIRECTORY) + get_target_property(products_folder ${target_name} LIBRARY_OUTPUT_DIRECTORY) set(product_name $) if(kind STREQUAL "VST3")