mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-26 05:49:00 +08:00
850ba1ac73
* boringssl: Add a patch to disable another warning breaking build for VS2022. Filed upstream as https://bugs.chromium.org/p/boringssl/issues/detail?id=495 * Update versions * format portfile.cmake * x-add-version * Update patch, remove -WX and -Werror * x-add-version * update patch's name * x-add-version Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
25 lines
1.3 KiB
Diff
25 lines
1.3 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 83ff477..3008c2a 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -117,7 +117,7 @@ endif()
|
|
if(CMAKE_COMPILER_IS_GNUCXX OR CLANG)
|
|
# Note clang-cl is odd and sets both CLANG and MSVC. We base our configuration
|
|
# primarily on our normal Clang one.
|
|
- set(C_CXX_FLAGS "-Werror -Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings -Wvla")
|
|
+ set(C_CXX_FLAGS "-Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings -Wvla")
|
|
if(MSVC)
|
|
# clang-cl sets different default warnings than clang. It also treats -Wall
|
|
# as -Weverything, to match MSVC. Instead -W3 is the alias for -Wall.
|
|
@@ -238,8 +238,8 @@ elseif(MSVC)
|
|
${MSVC_DISABLED_WARNINGS_LIST})
|
|
string(REPLACE "C" " -w4" MSVC_LEVEL4_WARNINGS_STR
|
|
${MSVC_LEVEL4_WARNINGS_LIST})
|
|
- set(CMAKE_C_FLAGS "-utf-8 -Wall -WX ${MSVC_DISABLED_WARNINGS_STR} ${MSVC_LEVEL4_WARNINGS_STR}")
|
|
- set(CMAKE_CXX_FLAGS "-utf-8 -Wall -WX ${MSVC_DISABLED_WARNINGS_STR} ${MSVC_LEVEL4_WARNINGS_STR}")
|
|
+ set(CMAKE_C_FLAGS "-utf-8 -Wall ${MSVC_DISABLED_WARNINGS_STR} ${MSVC_LEVEL4_WARNINGS_STR}")
|
|
+ set(CMAKE_CXX_FLAGS "-utf-8 -Wall ${MSVC_DISABLED_WARNINGS_STR} ${MSVC_LEVEL4_WARNINGS_STR}")
|
|
endif()
|
|
|
|
if(WIN32)
|