diff --git a/cmake/wrap_auv2.cmake b/cmake/wrap_auv2.cmake index e02bc447..d09ac8df 100644 --- a/cmake/wrap_auv2.cmake +++ b/cmake/wrap_auv2.cmake @@ -52,6 +52,7 @@ function(target_add_auv2_wrapper) set(bhtg ${AUV2_TARGET}-build-helper) set(bhsc "${CLAP_WRAPPER_CMAKE_CURRENT_SOURCE_DIR}/src/detail/auv2/build-helper/") add_executable(${bhtg} ${bhsc}/build-helper.cpp) + target_compile_options(${bhtg} PRIVATE $<$:-fno-char8_t>) target_link_libraries(${bhtg} PRIVATE clap-wrapper-shared-detail macos_filesystem_support diff --git a/cmake/wrap_standalone.cmake b/cmake/wrap_standalone.cmake index 5c238665..a13c9868 100644 --- a/cmake/wrap_standalone.cmake +++ b/cmake/wrap_standalone.cmake @@ -53,11 +53,16 @@ function(target_add_standalone_wrapper) ) target_link_libraries(${salib} PUBLIC - clap-wrapper-compile-options clap-wrapper-shared-detail base-sdk-rtmidi base-sdk-rtaudio ) + target_link_libraries(${salib} PRIVATE clap-wrapper-compile-options) + if (MSVC) + target_compile_options(${salib} PRIVATE $<$:/Zc:char8_t->) + else() + target_compile_options(${salib} PRIVATE $<$:-fno-char8_t>) + endif() if (APPLE) target_sources(${salib} PRIVATE) @@ -185,7 +190,6 @@ function(target_add_standalone_wrapper) ) target_link_libraries(${SA_TARGET} PRIVATE - clap-wrapper-compile-options ${salib} ) endfunction(target_add_standalone_wrapper) diff --git a/cmake/wrap_vst3.cmake b/cmake/wrap_vst3.cmake index 2164bc84..4e862f0d 100644 --- a/cmake/wrap_vst3.cmake +++ b/cmake/wrap_vst3.cmake @@ -30,6 +30,12 @@ function(private_add_vst3_wrapper_sources) ${sd}/src/detail/vst3/aravst3.h ) + if (MSVC) + target_compile_options(${tg} PRIVATE $<$:/Zc:char8_t->) + else() + target_compile_options(${tg} PRIVATE $<$:-fno-char8_t>) + endif() + target_include_directories(${V3_TARGET}-clap-wrapper-vst3-lib PRIVATE "${sd}/include") endfunction(private_add_vst3_wrapper_sources)