sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make C++ standard the same for lib, plugin and editor

Browse source
This commit is contained in:
Jean Pierre Cimalando 2021-04-08 01:11:06 +02:00
parent 3c00c8b750
commit 01ae6946e3
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cmake/SfizzConfig.cmake
View file

@ -14,6 +14,14 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CMAKE_CXX_VISIBILITY_PRESET hidden) set(CMAKE_CXX_VISIBILITY_PRESET hidden)
set(CMAKE_VISIBILITY_INLINES_HIDDEN ON) set(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
# Set C++ compatibility level
if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC" AND CMAKE_CXX_STANDARD LESS 17)
set(CMAKE_CXX_STANDARD 17)
elseif((SFIZZ_LV2_UI OR SFIZZ_VST OR SFIZZ_AU) AND CMAKE_CXX_STANDARD LESS 14)
# if the UI is part of the build, make it 14
set(CMAKE_CXX_STANDARD 14)
endif()
# Process sources as UTF-8 # Process sources as UTF-8
if(MSVC) if(MSVC)
add_compile_options("/utf-8") add_compile_options("/utf-8")
@ -57,7 +65,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
endif() endif()
endif() endif()
elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
set(CMAKE_CXX_STANDARD 17)
add_compile_options(/Zc:__cplusplus) add_compile_options(/Zc:__cplusplus)
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>") set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
endif() endif()

4
plugins/editor/cmake/Vstgui.cmake
View file

@ -207,10 +207,6 @@ if(${CMAKE_BUILD_TYPE} MATCHES "Release")
endif() endif()
if(CMAKE_SYSTEM_NAME STREQUAL "Windows") if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
# higher C++ requirement on Windows
if(NOT CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS 14)
set_property(TARGET sfizz_vstgui PROPERTY CXX_STANDARD 14)
endif()
# Windows 10 RS2 DDI for custom fonts # Windows 10 RS2 DDI for custom fonts
target_compile_definitions(sfizz_vstgui PRIVATE "NTDDI_VERSION=0x0A000003") target_compile_definitions(sfizz_vstgui PRIVATE "NTDDI_VERSION=0x0A000003")
# disable custom fonts if dwrite3 API is unavailable in MinGW # disable custom fonts if dwrite3 API is unavailable in MinGW

3
plugins/vst/cmake/Vst3.cmake
View file

@ -36,9 +36,6 @@ function(plugin_add_vst3sdk NAME)
"${VST3SDK_BASEDIR}/public.sdk/source/common/threadchecker_win32.cpp" "${VST3SDK_BASEDIR}/public.sdk/source/common/threadchecker_win32.cpp"
"${VST3SDK_BASEDIR}/public.sdk/source/vst/vstgui_win32_bundle_support.cpp" "${VST3SDK_BASEDIR}/public.sdk/source/vst/vstgui_win32_bundle_support.cpp"
"${VST3SDK_BASEDIR}/public.sdk/source/main/dllmain.cpp") "${VST3SDK_BASEDIR}/public.sdk/source/main/dllmain.cpp")
if(NOT CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS 14)
set_property(TARGET "${NAME}" PROPERTY CXX_STANDARD 14)
endif()
elseif(APPLE) elseif(APPLE)
target_sources("${NAME}" PRIVATE target_sources("${NAME}" PRIVATE
"${VST3SDK_BASEDIR}/public.sdk/source/main/macmain.cpp") "${VST3SDK_BASEDIR}/public.sdk/source/main/macmain.cpp")