diff options
| author | Phil Christensen <philc@microsoft.com> | 2018-12-06 15:06:28 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2018-12-06 15:06:28 -0800 |
| commit | 7347305e8459fcc78553a9f88196e0d93eb0a8fe (patch) | |
| tree | ac9eee9ff267c6a71a83249bed7a94f02b00d9a5 /ports/yaml-cpp | |
| parent | ed9357a5aafea7192932b5874264bd103fc61255 (diff) | |
| parent | 63c1b2628e958f8e02356411f032941c0c2f3bbb (diff) | |
| download | vcpkg-7347305e8459fcc78553a9f88196e0d93eb0a8fe.tar.gz vcpkg-7347305e8459fcc78553a9f88196e0d93eb0a8fe.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/3425
Diffstat (limited to 'ports/yaml-cpp')
| -rw-r--r-- | ports/yaml-cpp/0001-noexcept.patch | 26 | ||||
| -rw-r--r-- | ports/yaml-cpp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/yaml-cpp/portfile.cmake | 2 |
3 files changed, 29 insertions, 1 deletions
diff --git a/ports/yaml-cpp/0001-noexcept.patch b/ports/yaml-cpp/0001-noexcept.patch new file mode 100644 index 000000000..e5e1882c0 --- /dev/null +++ b/ports/yaml-cpp/0001-noexcept.patch @@ -0,0 +1,26 @@ +diff --git a/include/yaml-cpp/exceptions.h b/include/yaml-cpp/exceptions.h
+index 9c96859..a6045ee 100644
+--- a/include/yaml-cpp/exceptions.h
++++ b/include/yaml-cpp/exceptions.h
+@@ -15,7 +15,7 @@
+
+ // This is here for compatibility with older versions of Visual Studio
+ // which don't support noexcept
+-#ifdef _MSC_VER
++#if defined(_MSC_VER) && _MSC_VER < 1900
+ #define YAML_CPP_NOEXCEPT _NOEXCEPT
+ #else
+ #define YAML_CPP_NOEXCEPT noexcept
+diff --git a/src/exceptions.cpp b/src/exceptions.cpp
+index 9b6d891..931b4bc 100644
+--- a/src/exceptions.cpp
++++ b/src/exceptions.cpp
+@@ -2,7 +2,7 @@
+
+ // This is here for compatibility with older versions of Visual Studio
+ // which don't support noexcept
+-#ifdef _MSC_VER
++#if defined(_MSC_VER) && _MSC_VER < 1900
+ #define YAML_CPP_NOEXCEPT _NOEXCEPT
+ #else
+ #define YAML_CPP_NOEXCEPT noexcept
diff --git a/ports/yaml-cpp/CONTROL b/ports/yaml-cpp/CONTROL index 1e2d0e5c9..0689f8d4e 100644 --- a/ports/yaml-cpp/CONTROL +++ b/ports/yaml-cpp/CONTROL @@ -1,3 +1,3 @@ Source: yaml-cpp -Version: 0.6.2 +Version: 0.6.2-2 Description: yaml-cpp is a YAML parser and emitter in C++ matching the YAML 1.2 spec. diff --git a/ports/yaml-cpp/portfile.cmake b/ports/yaml-cpp/portfile.cmake index 071931f64..6233bc076 100644 --- a/ports/yaml-cpp/portfile.cmake +++ b/ports/yaml-cpp/portfile.cmake @@ -5,6 +5,8 @@ vcpkg_from_github( REF yaml-cpp-0.6.2 SHA512 fea8ce0a20a00cbc75023d1db442edfcd32d0ac57a3c41b32ec8d56f87cc1d85d7dd7a923ce662f5d3a315f91a736d6be0d649997acd190915c1d68cc93795e4 HEAD_REF master + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/0001-noexcept.patch ) vcpkg_configure_cmake( |