Add additional warning to ignore to boringssl build.

Author: jonsimantov

cmake/external/boringssl.cmake

@@ -19,7 +19,7 @@ if(TARGET boringssl OR NOT DOWNLOAD_BORINGSSL)
 endif()
 
 set(patch_file 
-  ${CMAKE_CURRENT_LIST_DIR}/../../scripts/git/patches/boringssl/0001-disable-C4255-converting-empty-params-to-void.patch)
+  ${CMAKE_CURRENT_LIST_DIR}/../../scripts/git/patches/boringssl/0001-disable-warnings.patch)
 
 set(boringssl_commit_tag 83da28a68f32023fd3b95a8ae94991a07b1f6c62)
 

cmake/external_rules.cmake

@@ -188,8 +188,6 @@ function(build_external_dependencies)
       set(CMAKE_SUB_BUILD_OPTIONS ${CMAKE_SUB_BUILD_OPTIONS}
           --config Release)
     endif()
-    # On Windows, disable warning 4191: unsafe type conversion
-    set(disable_warnings "/WD4191")
     if(MSVC_RUNTIME_LIBRARY_STATIC)
       set(CMAKE_SUB_CONFIGURE_OPTIONS ${CMAKE_SUB_CONFIGURE_OPTIONS}
           -DCMAKE_C_FLAGS_RELEASE="/MT"
@@ -198,13 +196,13 @@ function(build_external_dependencies)
           -DCMAKE_CXX_FLAGS_DEBUG="/MTd")
       if (CMAKE_BUILD_TYPE STREQUAL "Debug")
         set(CMAKE_SUB_CONFIGURE_OPTIONS ${CMAKE_SUB_CONFIGURE_OPTIONS}
-            -DCMAKE_C_FLAGS="/MTd ${disable_warnings}"
-            -DCMAKE_CXX_FLAGS="/MTd ${disable_warnings}"
+            -DCMAKE_C_FLAGS="/MTd"
+            -DCMAKE_CXX_FLAGS="/MTd"
             -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebug)
       else()
         set(CMAKE_SUB_CONFIGURE_OPTIONS ${CMAKE_SUB_CONFIGURE_OPTIONS}
-            -DCMAKE_C_FLAGS="/MT ${disable_warnings}"
-            -DCMAKE_CXX_FLAGS="/MT ${disable_warnings}"
+            -DCMAKE_C_FLAGS="/MT"
+            -DCMAKE_CXX_FLAGS="/MT"
             -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded)
       endif()
     else()  # dynamic (DLL) runtime
@@ -215,13 +213,13 @@ function(build_external_dependencies)
           -DCMAKE_CXX_FLAGS_DEBUG="/MDd")
       if (CMAKE_BUILD_TYPE STREQUAL "Debug")
         set(CMAKE_SUB_CONFIGURE_OPTIONS ${CMAKE_SUB_CONFIGURE_OPTIONS}
-            -DCMAKE_C_FLAGS="/MDd ${disable_warnings}"
-            -DCMAKE_CXX_FLAGS="/MDd ${disable_warnings}"
+            -DCMAKE_C_FLAGS="/MDd"
+            -DCMAKE_CXX_FLAGS="/MDd"
             -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebugDLL)
       else()
         set(CMAKE_SUB_CONFIGURE_OPTIONS ${CMAKE_SUB_CONFIGURE_OPTIONS}
-            -DCMAKE_C_FLAGS="/MD ${disable_warnings}"
-            -DCMAKE_CXX_FLAGS="/MD ${disable_warnings}"
+            -DCMAKE_C_FLAGS="/MD"
+            -DCMAKE_CXX_FLAGS="/MD"
             -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL)
       endif()
     endif()

scripts/git/patches/boringssl/0001-disable-C4255-converting-empty-params-to-void.patch renamed to scripts/git/patches/boringssl/0001-disable-warnings.patch

@@ -11,12 +11,14 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
 index b7f468fe6..48f61bfd8 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -193,6 +193,8 @@ elseif(MSVC)
+@@ -193,7 +193,10 @@ elseif(MSVC)
                # possible loss of data
        "C4244" # 'function' : conversion from 'int' to 'uint8_t',
                # possible loss of data
 +      "C4255" # 'function' : no function prototype given: converting '()' to
 +              # '(void)'
++      "C4191" # 'operator/operation' : unsafe conversion from 'type of
++              # expression' to 'type required'
        "C4267" # conversion from 'size_t' to 'int', possible loss of data
        "C4371" # layout of class may have changed from a previous version of the
                # compiler due to better packing of member '...'