mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

CMake: Fix issue with VST, VST3, and Unity targets

Browse source 
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.
This commit is contained in:
reuk 2020-05-04 16:12:27 +01:00
parent 56100600b8
commit f0642979f9
No known key found for this signature in database
GPG key ID: 9ADCD339CFC98A11
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
extras/Build/CMake/JUCEUtils.cmake
View file

@ -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 $<TARGET_PROPERTY:${source_target},JUCE_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 "$<GENEX_EVAL:$<TARGET_PROPERTY:${shared_code_target},ARCHIVE_OUTPUT_DIRECTORY>>"
LIBRARY_OUTPUT_DIRECTORY "$<GENEX_EVAL:$<TARGET_PROPERTY:${shared_code_target},LIBRARY_OUTPUT_DIRECTORY>>"
RUNTIME_OUTPUT_DIRECTORY "$<GENEX_EVAL:$<TARGET_PROPERTY:${shared_code_target},RUNTIME_OUTPUT_DIRECTORY>>")
ARCHIVE_OUTPUT_DIRECTORY "$<GENEX_EVAL:$<TARGET_PROPERTY:${shared_code_target},ARCHIVE_OUTPUT_DIRECTORY>>/${kind}"
LIBRARY_OUTPUT_DIRECTORY "$<GENEX_EVAL:$<TARGET_PROPERTY:${shared_code_target},LIBRARY_OUTPUT_DIRECTORY>>/${kind}"
RUNTIME_OUTPUT_DIRECTORY "$<GENEX_EVAL:$<TARGET_PROPERTY:${shared_code_target},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 $<TARGET_PROPERTY:${shared_code_target},JUCE_PRODUCT_NAME>)
if(kind STREQUAL "VST3")