From 5d7643a6805e4104691f8ae47f03e4dedc006777 Mon Sep 17 00:00:00 2001 From: Scott Mansell Date: Sun, 29 Jan 2023 22:11:52 +1300 Subject: [PATCH] CMake/MSVC: Fix conflicting flags in mbedtls This cmake file directly sets CMAKE__FLAGS, which doesn't show up in the COMPILE_COMMANDS target property and so our dolphin_disable_warnings_msvc macro failes to remove it. So we will just commit it out. --- Externals/mbedtls/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Externals/mbedtls/CMakeLists.txt b/Externals/mbedtls/CMakeLists.txt index ab43a40899..6f448876cb 100644 --- a/Externals/mbedtls/CMakeLists.txt +++ b/Externals/mbedtls/CMakeLists.txt @@ -227,12 +227,14 @@ endif(CMAKE_COMPILER_IS_IAR) if(CMAKE_COMPILER_IS_MSVC) # Strictest warnings - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3") + # Dolphin/MSVC: we want to disable all warnings for externals + #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3") endif(CMAKE_COMPILER_IS_MSVC) if(MBEDTLS_FATAL_WARNINGS) if(CMAKE_COMPILER_IS_MSVC) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") + # Dolphin/MSVC: we want to disable all warnings for externals + #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") endif(CMAKE_COMPILER_IS_MSVC) if(CMAKE_COMPILER_IS_CLANG OR CMAKE_COMPILER_IS_GNU)