Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix include paths inconsistency in case vst2 sdk path is set #1378

Closed
wants to merge 1 commit into from
Closed

Fix include paths inconsistency in case vst2 sdk path is set #1378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion extras/Build/CMake/JUCEModuleSupport.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,8 @@ function(juce_add_module module_path)

target_include_directories(juce_vst3_headers INTERFACE
"$<$<TARGET_EXISTS:juce_vst3_sdk>:$<TARGET_PROPERTY:juce_vst3_sdk,INTERFACE_INCLUDE_DIRECTORIES>>"
"$<$<NOT:$<TARGET_EXISTS:juce_vst3_sdk>>:${base_path}/juce_audio_processors/format_types/VST3_SDK>")
"$<$<NOT:$<TARGET_EXISTS:juce_vst3_sdk>>:${base_path}/juce_audio_processors/format_types/VST3_SDK>"
"$<$<TARGET_EXISTS:juce_vst2_sdk>:$<TARGET_PROPERTY:juce_vst2_sdk,INTERFACE_INCLUDE_DIRECTORIES>>")

target_link_libraries(juce_audio_processors INTERFACE juce_vst3_headers)

Expand Down
6 changes: 1 addition & 5 deletions extras/Build/CMake/JUCEUtils.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1965,7 +1965,6 @@ function(_juce_initialise_target target)

target_include_directories(${target} PRIVATE
$<TARGET_PROPERTY:${target},JUCE_GENERATED_SOURCES_DIRECTORY>)
target_link_libraries(${target} PUBLIC $<$<TARGET_EXISTS:juce_vst2_sdk>:juce_vst2_sdk>)

get_target_property(is_pluginhost_au ${target} JUCE_PLUGINHOST_AU)

Expand Down Expand Up @@ -2291,10 +2290,7 @@ function(juce_set_vst2_sdk_path path)

add_library(juce_vst2_sdk INTERFACE IMPORTED GLOBAL)

# This is a bit of a hack, but we really need the VST2 paths to always follow the VST3 paths.
target_include_directories(juce_vst2_sdk INTERFACE
$<TARGET_PROPERTY:juce::juce_vst3_headers,INTERFACE_INCLUDE_DIRECTORIES>
"${path}")
target_include_directories(juce_vst2_sdk INTERFACE "${path}")
endfunction()

function(juce_set_vst3_sdk_path path)
Expand Down