Mirrors/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2025-12-28 07:55:01 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

cmake: Disable char8_t when using C++20

Browse Source
This commit is contained in:
derrod 2023-07-02 06:09:20 +02:00 committed by Lain
parent 914951a28d
commit 8d33da1fab
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/common/compiler_common.cmake
View File

@ -74,6 +74,10 @@ set(_obs_clang_cxx_options
-Werror=block-capture-autoreleasing
-Wrange-loop-analysis)
if(CMAKE_CXX_STANDARD GREATER_EQUAL 20)
list(APPEND _obs_clang_cxx_options -fno-char8_t)
endif()
if(NOT DEFINED CMAKE_COMPILE_WARNING_AS_ERROR)
set(CMAKE_COMPILE_WARNING_AS_ERROR ON)
endif()

4
cmake/windows/compilerconfig.cmake
View File

@ -37,6 +37,10 @@ set(_obs_msvc_c_options /Brepro /MP /permissive- /Zc:__cplusplus /Zc:preprocesso
set(_obs_msvc_cpp_options /Brepro /MP /permissive- /Zc:__cplusplus /Zc:preprocessor)
if(CMAKE_CXX_STANDARD GREATER_EQUAL 20)
list(APPEND _obs_msvc_cpp_options /Zc:char8_t-)
endif()
add_compile_options(
/W3
/utf-8