mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-12 01:49:02 +08:00
1550b9e71b
* [many ports] Upgrades 2019.07.11 * Re-generate patches and fix build errors. * [manyport]Fix build errors. * Fix avro-c and console-bridge failures, revert curl and tesseract * fix botan failure * Fix build errors and undo some ports upgrades. * [aws-c-common,chipmunk,cxxopts,grpc]Fix build errors * Fix build errors. * [angle]Undo upgrade changes. * [directxtk]Fix UWP build error (#7233) * Revert leptonica since it cause tesseract failed * Revert jsonnet * [google-cloud-cpp] Disable parallel configure due to source directory writes * [many ports] Undo undesired changes * [bitsery] Fix indentation * [avro-c][aws-c-common][graphite2] Convert line endings to minimize PR diff * fix console-bridge and remove usockets unused patch * update ogre patch * [many ports] Revert unneeded changes w.r.t. master. Add missing write to console-bridge. * [console-bridge] Fix export macro * [avro-c] Revert upgrade; split to #7875 * [avro-c] Complete previous revert
21 lines
957 B
Diff
21 lines
957 B
Diff
diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake
|
|
index 0f597d7..1359b8b 100644
|
|
--- a/cmake/AwsCFlags.cmake
|
|
+++ b/cmake/AwsCFlags.cmake
|
|
@@ -35,15 +35,6 @@ function(aws_set_common_properties target)
|
|
# /volatile:iso relaxes some implicit memory barriers that MSVC normally applies for volatile accesses
|
|
# Since we want to be compatible with user builds using /volatile:iso, use it for the tests.
|
|
list(APPEND AWS_C_FLAGS /volatile:iso)
|
|
-
|
|
- string(TOUPPER "${CMAKE_BUILD_TYPE}" _CMAKE_BUILD_TYPE)
|
|
- if(STATIC_CRT)
|
|
- string(REPLACE "/MD" "/MT" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
|
|
- else()
|
|
- string(REPLACE "/MT" "/MD" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
|
|
- endif()
|
|
- string(REPLACE " " ";" _FLAGS "${_FLAGS}")
|
|
- list(APPEND AWS_C_FLAGS "${_FLAGS}")
|
|
|
|
else()
|
|
list(APPEND AWS_C_FLAGS -Wall -Werror -Wstrict-prototypes)
|