1berry/obs-studio
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UI: Disable warnings emitted by Qt frameworks

Browse Source 
Qt uses quoted includes in Framework headers (which is discouraged
by Apple) and also has some questionable use of the comma operator.
This commit is contained in:
PatTheMav 2023-04-06 01:06:32 +02:00 committed by Ryan Foster
parent ced135a68e
commit 5ca17aa25f
5 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
UI/cmake/os-macos.cmake
View File

@ -13,8 +13,9 @@ set_source_files_properties(platform-osx.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
target_link_libraries(obs-studio PRIVATE ${APPKIT} ${AVFOUNDATION} ${APPLICATIONSERVICES}) target_link_libraries(obs-studio PRIVATE ${APPKIT} ${AVFOUNDATION} ${APPLICATIONSERVICES})
target_compile_options(obs-studio PRIVATE -Wno-error=float-conversion -Wno-error=implicit-int-conversion target_compile_options(
-Wno-error=shorten-64-to-32) obs-studio PRIVATE -Wno-error=float-conversion -Wno-error=implicit-int-conversion -Wno-error=shorten-64-to-32
-Wno-quoted-include-in-framework-header -Wno-comma)
if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 14.0.3) if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 14.0.3)
target_compile_options(obs-studio PRIVATE -Wno-error=unqualified-std-cast-call) target_compile_options(obs-studio PRIVATE -Wno-error=unqualified-std-cast-call)

3
UI/frontend-plugins/aja-output-ui/CMakeLists.txt
View File

@ -73,7 +73,8 @@ elseif(OS_MACOS)
find_library(APPKIT_FRAMEWORK AppKit) find_library(APPKIT_FRAMEWORK AppKit)
target_link_libraries(aja-output-ui PRIVATE ${IOKIT} ${COREFOUNDATION} ${APPKIT}) target_link_libraries(aja-output-ui PRIVATE ${IOKIT} ${COREFOUNDATION} ${APPKIT})
target_compile_options(aja-output-ui PRIVATE -Wno-error=deprecated-declarations) target_compile_options(aja-output-ui PRIVATE -Wno-error=deprecated-declarations
-Wno-quoted-include-in-framework-header)
elseif(OS_LINUX OR OS_FREEBSD) elseif(OS_LINUX OR OS_FREEBSD)
find_package(X11 REQUIRED) find_package(X11 REQUIRED)
target_link_libraries(aja-output-ui PRIVATE X11::X11 Qt::GuiPrivate) target_link_libraries(aja-output-ui PRIVATE X11::X11 Qt::GuiPrivate)

1
UI/frontend-plugins/decklink-captions/CMakeLists.txt
View File

@ -27,6 +27,7 @@ elseif(OS_MACOS)
find_library(COCOA Cocoa) find_library(COCOA Cocoa)
mark_as_advanced(COCOA) mark_as_advanced(COCOA)
target_link_libraries(decklink-captions PRIVATE ${COCOA}) target_link_libraries(decklink-captions PRIVATE ${COCOA})
target_compile_options(decklink-captions PRIVATE -Wno-quoted-include-in-framework-header -Wno-comma)
elseif(OS_LINUX OR OS_FREEBSD) elseif(OS_LINUX OR OS_FREEBSD)
find_package(X11 REQUIRED) find_package(X11 REQUIRED)
mark_as_advanced(X11) mark_as_advanced(X11)

1
UI/frontend-plugins/decklink-output-ui/CMakeLists.txt
View File

@ -51,6 +51,7 @@ elseif(OS_MACOS)
mark_as_advanced(COCOA) mark_as_advanced(COCOA)
target_link_libraries(decklink-output-ui PRIVATE ${COCOA}) target_link_libraries(decklink-output-ui PRIVATE ${COCOA})
target_compile_options(decklink-output-ui PRIVATE -Wno-quoted-include-in-framework-header)
elseif(OS_LINUX OR OS_FREEBSD) elseif(OS_LINUX OR OS_FREEBSD)
find_package(X11 REQUIRED) find_package(X11 REQUIRED)
target_link_libraries(decklink-output-ui PRIVATE X11::X11 Qt::GuiPrivate) target_link_libraries(decklink-output-ui PRIVATE X11::X11 Qt::GuiPrivate)

1
UI/frontend-plugins/frontend-tools/CMakeLists.txt
View File

@ -72,6 +72,7 @@ elseif(OS_MACOS)
target_link_libraries(frontend-tools PRIVATE ${COCOA}) target_link_libraries(frontend-tools PRIVATE ${COCOA})
target_sources(frontend-tools PRIVATE auto-scene-switcher-osx.mm) target_sources(frontend-tools PRIVATE auto-scene-switcher-osx.mm)
target_compile_options(frontend-tools PRIVATE -Wno-quoted-include-in-framework-header -Wno-comma)
set_target_properties(frontend-tools PROPERTIES XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES) set_target_properties(frontend-tools PROPERTIES XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES)
if(NOT XCODE) if(NOT XCODE)
set_source_files_properties(auto-scene-switcher-osx.mm PROPERTIES COMPILE_FLAGS -fobjc-arc) set_source_files_properties(auto-scene-switcher-osx.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)