mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-10 02:21:49 +08:00
229f537c94
* Add meson from https://github.com/microsoft/vcpkg/pull/12860/ * Add autoconf-archive from https://github.com/microsoft/vcpkg/pull/13081/ * Add kf5windowsystem libs from https://github.com/microsoft/vcpkg/pull/13467/ * Open the FTP and SFTP ports from https://github.com/microsoft/vcpkg/pull/14412/ * Add libxcb-util0-dev from https://github.com/microsoft/vcpkg/pull/14678/ * Add libasound2-dev from https://github.com/microsoft/vcpkg/pull/14774 * Remove no longer necessary apt-mark calls. * Update nasm on Linux. * Fix longstanding bug where Storage was publicly accessible and change to generate SAS token rather than File Share * Delete no longer necessary azure storage firewall rules. * Install the newer Windows SDK with the VS installer instead of manually. * Install the VS2015 and VS2017 compilers. * Update Powershell-Core to 7.1.0. * Update source of WDK. * Update pools. * [opentracing] Repair arm64-windows failures caused by mojibake in `expected.hpp` and errors in opentracing-cpp's lint for arm64 where it thinks exceptions are disabled when they are enabled. Fixes: C:\Dev\vcpkg\buildtrees\opentracing\src\b67575dab0-0250653c81.clean\3rd_party\include\opentracing/expected/expected.hpp(1): warning C4828: The file contains a character starting at offset 0x4a77 that is illegal in the current source character set (codepage 65001). Fixes: D:\buildtrees\opentracing\src\b67575dab0-0250653c81.clean\include\opentracing/tracer.h:223:5: error: cannot use 'try' with exceptions disabled [clang-diagnostic-error] try { ^ * [mmloader] Patch out overrides of CMAKE_C_FLAGS and CMAKE_CXX_FLAGS that inserted /WX. Note that this port sets /GS-, possibly because it may be for authoring shellcode. * Bump storage API version to 2020-04-08.
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 7a22b56..2ce1bd8 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -47,24 +47,11 @@ set(CMAKE_CXX_STANDARD 11)
|
|
set(CMAKE_CONFIGURATION_TYPES Debug Release)
|
|
|
|
# Default compile flags
|
|
-set(CMAKE_CXX_FLAGS
|
|
- "/DWIN32 /D_WINDOWS /W3 /WX /GR /GS- /Gy /FAcs /Z7 /DEBUG"
|
|
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GS-"
|
|
CACHE STRING "default C++ compile flags" FORCE)
|
|
-set(CMAKE_CXX_FLAGS_DEBUG
|
|
- "/MTd /Ob0 /Od"
|
|
- CACHE STRING "default C++ compile flags for debug build" FORCE)
|
|
-set(CMAKE_CXX_FLAGS_RELEASE
|
|
- "/MT /O2 /Ob2 /DNDEBUG"
|
|
- CACHE STRING "default C++ compile flags for release build" FORCE)
|
|
-set(CMAKE_C_FLAGS
|
|
- "/DWIN32 /D_WINDOWS /W3 /WX /GR /GS- /Gy /FAcs /Z7 /DEBUG"
|
|
+set(CMAKE_C_FLAGS
|
|
+ "${CMAKE_C_FLAGS} /GS-"
|
|
CACHE STRING "default C++ compile flags" FORCE)
|
|
-set(CMAKE_C_FLAGS_DEBUG
|
|
- "/MTd /Ob0 /Od"
|
|
- CACHE STRING "default C++ compile flags for debug build" FORCE)
|
|
-set(CMAKE_C_FLAGS_RELEASE
|
|
- "/MT /O2 /Ob2 /DNDEBUG"
|
|
- CACHE STRING "default C++ compile flags for release build" FORCE)
|
|
|
|
message(STATUS "CMAKE_CXX_FLAGS=" ${CMAKE_CXX_FLAGS})
|
|
message(STATUS "CMAKE_CXX_FLAGS_DEBUG=" ${CMAKE_CXX_FLAGS_DEBUG})
|