diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2019-08-24 13:43:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-24 13:43:57 -0700 |
| commit | 1550b9e71b6ef8530b39db281903edcab73c2e14 (patch) | |
| tree | 91ee3999b75a66f109b72e5da9a647041b9f7f3d /ports/cxxopts | |
| parent | 18a07faca5c8440fb77eb9ec1d76f14841686011 (diff) | |
| download | vcpkg-1550b9e71b6ef8530b39db281903edcab73c2e14.tar.gz vcpkg-1550b9e71b6ef8530b39db281903edcab73c2e14.zip | |
[many ports] Updates 2019.07.09 (#7217)
* [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
Diffstat (limited to 'ports/cxxopts')
| -rw-r--r-- | ports/cxxopts/fix-uwp-error.patch | 13 | ||||
| -rw-r--r-- | ports/cxxopts/portfile.cmake | 2 |
2 files changed, 15 insertions, 0 deletions
diff --git a/ports/cxxopts/fix-uwp-error.patch b/ports/cxxopts/fix-uwp-error.patch new file mode 100644 index 000000000..da1d45595 --- /dev/null +++ b/ports/cxxopts/fix-uwp-error.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 440490b..0ceb003 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -54,6 +54,8 @@ endif()
+
+ add_library(cxxopts INTERFACE)
+
++add_definitions(-D_CRT_SECURE_NO_WARNINGS)
++
+ # optionally, enable unicode support using the ICU library
+ set(CXXOPTS_USE_UNICODE_HELP FALSE CACHE BOOL "Use ICU Unicode library")
+ if(CXXOPTS_USE_UNICODE_HELP)
diff --git a/ports/cxxopts/portfile.cmake b/ports/cxxopts/portfile.cmake index b1c6697ed..782b2f21e 100644 --- a/ports/cxxopts/portfile.cmake +++ b/ports/cxxopts/portfile.cmake @@ -5,6 +5,8 @@ vcpkg_from_github( REF v2.2.0 SHA512 9f5182b3a86b3d47d1ce5e1e222ab596fce59d3b2dcc0ab2c3802338d5e0f3e6556f2a5ff2accb32cae7e2db41ac5a361c93bf0256f9e44c316eaa4b47c19efa HEAD_REF master + PATCHES + fix-uwp-error.patch ) vcpkg_configure_cmake( |