From b0c1c9c86c36163f73c9835aa7a95a6391b7fe15 Mon Sep 17 00:00:00 2001 From: tytan652 Date: Fri, 5 Aug 2022 12:29:27 +0200 Subject: [PATCH] libobs,plugins: Remove individual -Wno-switch --- libobs/CMakeLists.txt | 7 +------ plugins/obs-ffmpeg/CMakeLists.txt | 5 ----- plugins/obs-filters/CMakeLists.txt | 6 ------ plugins/obs-x264/CMakeLists.txt | 6 ------ 4 files changed, 1 insertion(+), 23 deletions(-) diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt index 5b91b4bb0..4405eb66f 100644 --- a/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt @@ -264,12 +264,7 @@ target_compile_definitions( target_compile_features(libobs PRIVATE cxx_alias_templates) -target_compile_options( - libobs - PUBLIC ${ARCH_SIMD_FLAGS} - PRIVATE - $<$,$,$>:-Wno-switch> -) +target_compile_options(libobs PUBLIC ${ARCH_SIMD_FLAGS}) target_include_directories( libobs PUBLIC $ diff --git a/plugins/obs-ffmpeg/CMakeLists.txt b/plugins/obs-ffmpeg/CMakeLists.txt index 9671ef978..491dc6179 100644 --- a/plugins/obs-ffmpeg/CMakeLists.txt +++ b/plugins/obs-ffmpeg/CMakeLists.txt @@ -90,11 +90,6 @@ endif() set_target_properties(obs-ffmpeg PROPERTIES FOLDER "plugins/obs-ffmpeg" PREFIX "") -target_compile_options( - obs-ffmpeg - PRIVATE - $<$,$,$>:-Wno-switch> -) if(OS_WINDOWS) add_subdirectory(obs-amf-test) diff --git a/plugins/obs-filters/CMakeLists.txt b/plugins/obs-filters/CMakeLists.txt index 2b7ef640f..a483da9a1 100644 --- a/plugins/obs-filters/CMakeLists.txt +++ b/plugins/obs-filters/CMakeLists.txt @@ -184,12 +184,6 @@ target_include_directories( target_link_libraries(obs-filters PRIVATE OBS::libobs) -target_compile_options( - obs-filters - PRIVATE - $<$,$,$>:-Wno-switch> -) - set_target_properties(obs-filters PROPERTIES FOLDER "plugins" PREFIX "") if(OS_WINDOWS) diff --git a/plugins/obs-x264/CMakeLists.txt b/plugins/obs-x264/CMakeLists.txt index 2035105e8..09db3f814 100644 --- a/plugins/obs-x264/CMakeLists.txt +++ b/plugins/obs-x264/CMakeLists.txt @@ -16,12 +16,6 @@ target_link_libraries(obs-x264 PRIVATE LIBX264::LIBX264 OBS::opts-parser) set_target_properties(obs-x264 PROPERTIES FOLDER "plugins" PREFIX "") -target_compile_options( - obs-x264 - PRIVATE - $<$,$,$>:-Wno-switch> -) - if(OS_WINDOWS) set(MODULE_DESCRIPTION "OBS x264 encoder") configure_file(${CMAKE_SOURCE_DIR}/cmake/bundle/windows/obs-module.rc.in