diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7a32046..a93adb3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -73,7 +73,6 @@ jobs: -B build -S . -D CMAKE_BUILD_TYPE=${{ env.build_type }} - -D CMAKE_CXX_STANDARD=17 -D SFIZZ_JACK=OFF -D SFIZZ_RENDER=OFF -D SFIZZ_SHARED=OFF @@ -122,7 +121,6 @@ jobs: -B build -S . -D CMAKE_BUILD_TYPE=${{ env.build_type }} - -D CMAKE_CXX_STANDARD=17 -D SFIZZ_SHARED=OFF -D PLUGIN_AU=ON -D PLUGIN_LV2=ON @@ -198,7 +196,6 @@ jobs: -B build ` -S . ` -D CMAKE_BUILD_TYPE=${{ env.build_type }} ` - -D CMAKE_CXX_STANDARD=17 ` -D PLUGIN_LV2=ON ` -D PLUGIN_PUREDATA=ON ` -D PLUGIN_VST3=ON @@ -314,7 +311,6 @@ jobs: -B build -S . -D CMAKE_BUILD_TYPE=${{ env.build_type }} - -D CMAKE_CXX_STANDARD=17 -D ENABLE_LTO=OFF -D SFIZZ_SNDFILE_STATIC=ON -D SFIZZ_JACK=OFF diff --git a/CMakeLists.txt b/CMakeLists.txt index 82b16d4..3d6b4e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,6 +52,11 @@ if(WIN32) add_compile_definitions(_WIN32_WINNT=0x0A00) endif() +# Override sfizz CXX standard since vstgui requires 17 anyway +if (PLUGIN_AU OR PLUGIN_LV2_UI OR PLUGIN_VST3 OR PLUGIN_VST2) + set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to be used") +endif() + include(SfizzConfig) # Re-used for this project include(BundleDylibs)