Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[aws-sdk-cpp] no werror et al #29133

Merged
merged 1 commit into from
Jan 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions ports/aws-sdk-cpp/no-werror.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
diff --git a/cmake/compiler_settings.cmake b/cmake/compiler_settings.cmake
index b316590ee..f17c27184 100644
--- a/cmake/compiler_settings.cmake
+++ b/cmake/compiler_settings.cmake
@@ -53,7 +53,7 @@ macro(set_gcc_flags)
endmacro()

macro(set_gcc_warnings)
- list(APPEND AWS_COMPILER_WARNINGS "-Wno-deprecated-declarations" "-Wall" "-Werror" "-pedantic" "-Wextra")
+ list(APPEND AWS_COMPILER_WARNINGS "-Wno-deprecated-declarations" "-Wall" "-pedantic" "-Wextra")
if(COMPILER_CLANG)
if(PLATFORM_ANDROID)
# when using clang with libc and API lower than 21 we need to include Android support headers and ignore the gnu-include-next warning.
@@ -148,11 +148,6 @@ macro(set_msvc_warnings)
set(CMAKE_SHARED_LINKER_FLAGS_DEBUGOPT "")
endif()

- # warnings as errors, max warning level (4)
- if(NOT CMAKE_CXX_FLAGS MATCHES "/WX")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
- endif()
-
# taken from http://stackoverflow.com/questions/2368811/how-to-set-warning-level-in-cmake
if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
1 change: 1 addition & 0 deletions ports/aws-sdk-cpp/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ vcpkg_from_github(
fix-aws-root.patch
fix-openssl3.patch
lock-curl-http-and-tls-settings.patch
no-werror.patch
)

string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT)
Expand Down
2 changes: 1 addition & 1 deletion ports/aws-sdk-cpp/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$note": "Automatically generated by generateFeatures.ps1",
"name": "aws-sdk-cpp",
"version": "1.9.220",
"port-version": 2,
"port-version": 3,
"description": "AWS SDK for C++",
"homepage": "https://github.com/aws/aws-sdk-cpp",
"supports": "!(windows & arm) & !uwp",
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/aws-sdk-cpp.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "53396d33cc22ee631dbfbb9b9a3a656ee3f4ea38",
"version": "1.9.220",
"port-version": 3
},
{
"git-tree": "8303c2804c010e352168fda9a38e7256c30d170d",
"version": "1.9.220",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@
},
"aws-sdk-cpp": {
"baseline": "1.9.220",
"port-version": 2
"port-version": 3
},
"azmq": {
"baseline": "1.0.3",
Expand Down