diff options
| author | thewhiteninja <40250307+thewhiteninja@users.noreply.github.com> | 2020-08-05 22:52:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-05 13:52:43 -0700 |
| commit | 953b957bbe8d67afa76964afa29864a0865e6f06 (patch) | |
| tree | c390fabc3d2bb0b65cb6e0024dc6def39a02bc8d /ports/xeus | |
| parent | a2af235a171feb8dc5e8a0297dce41aee8576bf7 (diff) | |
| download | vcpkg-953b957bbe8d67afa76964afa29864a0865e6f06.tar.gz vcpkg-953b957bbe8d67afa76964afa29864a0865e6f06.zip | |
[nlohmann-json] Update to 3.9.0 (#12601)
* Update to 3.9.0
* Update ports/nlohmann-json/CONTROL
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
* add a patch to fix the build and nlohmann-json checks.
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Diffstat (limited to 'ports/xeus')
| -rw-r--r-- | ports/xeus/Fix-Compile-nlohmann-json.patch | 12 | ||||
| -rw-r--r-- | ports/xeus/portfile.cmake | 4 |
2 files changed, 15 insertions, 1 deletions
diff --git a/ports/xeus/Fix-Compile-nlohmann-json.patch b/ports/xeus/Fix-Compile-nlohmann-json.patch new file mode 100644 index 000000000..7381d14ca --- /dev/null +++ b/ports/xeus/Fix-Compile-nlohmann-json.patch @@ -0,0 +1,12 @@ +diff --git a/src/xmessage.cpp b/src/xmessage.cpp +index 0d6ad99..621d838 100644 +--- a/src/xmessage.cpp ++++ b/src/xmessage.cpp +@@ -12,6 +12,7 @@ + #include <sstream> + #include <string> + #include <utility> ++#include <ciso646> + + #include "xeus/xguid.hpp" + #include "xeus/xmessage.hpp" diff --git a/ports/xeus/portfile.cmake b/ports/xeus/portfile.cmake index 5dd646d7f..577dbff1c 100644 --- a/ports/xeus/portfile.cmake +++ b/ports/xeus/portfile.cmake @@ -4,7 +4,9 @@ vcpkg_from_github( REF 8408f237f33514610a59d19a5ff045ee70dfa02b SHA512 41282addbe5519b6d357e802c48483834cd951604bfeb8c99d96f02d03dec2fc66ea4c091f40ec09348bb60587e8a6efef5e6eb2bb950ba720fc8ceb7a107960
HEAD_REF master
- PATCHES Fix-TypeConversion.patch
+ PATCHES + Fix-TypeConversion.patch + Fix-Compile-nlohmann-json.patch )
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS)
|