Skip to content

Commit

Permalink
Merge pull request sfztools#89 from sfztools/paulfd/cxx-standard-tweaks
Browse files Browse the repository at this point in the history
Override the CXX_STANDARD to 17 for plugins
  • Loading branch information
paulfd authored May 28, 2023
2 parents 1c8f334 + ff3cd44 commit 1bfcfd4
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion library

0 comments on commit 1bfcfd4

Please sign in to comment.