From 5a8d2494b9e6ebd05aa26158a3e3b6c2bb205143 Mon Sep 17 00:00:00 2001 From: Paul Walker Date: Sat, 28 Sep 2024 10:40:02 -0400 Subject: [PATCH 1/4] Dont public-ify clap-wrapper-compile-options clap-wrapper-shared-details had a PUBLIC of clap-wrapper-compile-options which leaked a Wall upstream, causing problems using JUCE 8.0.2 and clap first vst3s. Ugh --- cmake/shared_prologue.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/shared_prologue.cmake b/cmake/shared_prologue.cmake index cf179106..dbfaa7ad 100644 --- a/cmake/shared_prologue.cmake +++ b/cmake/shared_prologue.cmake @@ -149,7 +149,8 @@ function(guarantee_clap_wrapper_shared) src/detail/clap/fsutil.cpp src/detail/clap/automation.h ) - target_link_libraries(clap-wrapper-shared-detail PUBLIC clap clap-wrapper-extensions clap-wrapper-compile-options) + target_link_libraries(clap-wrapper-shared-detail PUBLIC clap clap-wrapper-extensions clap-wrapper-compile-options-public) + target_link_libraries(clap-wrapper-shared-detail PRIVATE clap-wrapper-compile-options) target_include_directories(clap-wrapper-shared-detail PUBLIC libs/fmt) target_include_directories(clap-wrapper-shared-detail PUBLIC src) From 9f8a9249316353887c7a7786f5fa17519b8445ef Mon Sep 17 00:00:00 2001 From: Paul Walker Date: Sat, 28 Sep 2024 10:47:35 -0400 Subject: [PATCH 2/4] fix macos filesystem --- cmake/shared_prologue.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/shared_prologue.cmake b/cmake/shared_prologue.cmake index dbfaa7ad..77f3a77b 100644 --- a/cmake/shared_prologue.cmake +++ b/cmake/shared_prologue.cmake @@ -44,7 +44,7 @@ add_library(clap-wrapper-sanitizer-options INTERFACE) target_compile_options(clap-wrapper-compile-options INTERFACE -D${CLAP_WRAPPER_PLATFORM}=1 -DCLAP_WRAPPER_VERSION="${CLAP_WRAPPER_VERSION}") if (APPLE) - target_link_libraries(clap-wrapper-compile-options INTERFACE macos_filesystem_support) + target_link_libraries(clap-wrapper-compile-options-public INTERFACE macos_filesystem_support) endif() if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU") target_compile_options(clap-wrapper-compile-options INTERFACE -Wall -Wextra -Wno-unused-parameter -Wpedantic) From 1aa6b3e6db911ca27b12a0defa9daa6ad658ae7b Mon Sep 17 00:00:00 2001 From: Paul Walker Date: Sat, 28 Sep 2024 11:01:47 -0400 Subject: [PATCH 3/4] Got it --- cmake/shared_prologue.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/shared_prologue.cmake b/cmake/shared_prologue.cmake index 77f3a77b..9baf2ae1 100644 --- a/cmake/shared_prologue.cmake +++ b/cmake/shared_prologue.cmake @@ -42,7 +42,7 @@ target_link_libraries(clap-wrapper-compile-options INTERFACE clap-wrapper-compil # target_compile_definitions(clap-wrapper-compile-options-public INTERFACE -DTHIS_BUILD_USED_CLAP_WRAPPER_COMPILE_OPTIONS_PUBLIC=1) add_library(clap-wrapper-sanitizer-options INTERFACE) -target_compile_options(clap-wrapper-compile-options INTERFACE -D${CLAP_WRAPPER_PLATFORM}=1 -DCLAP_WRAPPER_VERSION="${CLAP_WRAPPER_VERSION}") +target_compile_options(clap-wrapper-compile-options-public INTERFACE -D${CLAP_WRAPPER_PLATFORM}=1 -DCLAP_WRAPPER_VERSION="${CLAP_WRAPPER_VERSION}") if (APPLE) target_link_libraries(clap-wrapper-compile-options-public INTERFACE macos_filesystem_support) endif() From 59a07b5c2561cdce8bb737dddfda3bd252cced09 Mon Sep 17 00:00:00 2001 From: Paul Walker Date: Sat, 28 Sep 2024 11:05:26 -0400 Subject: [PATCH 4/4] Even more --- cmake/shared_prologue.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/shared_prologue.cmake b/cmake/shared_prologue.cmake index 9baf2ae1..a8c4de3b 100644 --- a/cmake/shared_prologue.cmake +++ b/cmake/shared_prologue.cmake @@ -85,7 +85,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU") endif() if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") - target_compile_options(clap-wrapper-compile-options INTERFACE /utf-8 /Zc:__cplusplus) + target_compile_options(clap-wrapper-compile-options-public INTERFACE /utf-8 /Zc:__cplusplus) if (${CMAKE_CXX_STANDARD} GREATER_EQUAL 20) message(STATUS "clap-wrapper: Turning off char8_t c++20 changes") target_compile_options(clap-wrapper-compile-options-public INTERFACE /Zc:char8_t-)