Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[nlohmann-json] Update to 3.9.0 #12601

Merged
merged 4 commits into from Aug 5, 2020
Merged

[nlohmann-json] Update to 3.9.0 #12601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
428faf0
Update to 3.9.0
thewhiteninja Jul 27, 2020
f4539db
Update ports/nlohmann-json/CONTROL
thewhiteninja Jul 27, 2020
c36c835
add a patch to fix the build and nlohmann-json checks.
thewhiteninja Aug 5, 2020
5cef2c4
Merge branch 'master' of https://github.com/thewhiteninja/vcpkg
thewhiteninja Aug 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions ports/nlohmann-json/CONTROL
View file
Open in desktop
@@ -1,5 +1,4 @@
Source: nlohmann-json
Version: 3.8.0
Port-Version: 2
Version: 3.9.0
Homepage: https://github.com/nlohmann/json
Description: JSON for Modern C++
7 changes: 4 additions & 3 deletions ports/nlohmann-json/portfile.cmake
View file
Open in desktop
@@ -1,4 +1,4 @@
set(SOURCE_VERSION 3.8.0)
set(SOURCE_VERSION 3.9.0)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${PORT}-v${SOURCE_VERSION})

file(MAKE_DIRECTORY ${SOURCE_PATH})
Expand All @@ -13,16 +13,17 @@ function(download_src SUBPATH SHA512)
file(COPY ${FILE} DESTINATION ${SUBPATH_DIR})
endfunction()

download_src(CMakeLists.txt 18151b19cb5258e58feffac8d4aed559c87e158dc217f47be23351b15c86e1d3f3c5ad2f7d11beabe3f0c0f948f3da1b9a807d425b1a9a0bb1ed74767cefafa9)
download_src(CMakeLists.txt 8277349ee5479c25207182da50a908dd740b1dd1bf6fc4e19dd9ff0db348c07cc065e30bf5526744d18170a4934a73986a212728976015df3835a60a758214d9)
download_src(LICENSE.MIT d5f7bb6a33469e19250a5e20db44e7ba09602ee85bc0afb03e4932402b08ca1c0dbbe6376b7e0a84eb11c782d70ae96f130755967204d35420c6ecbcafd301e5)
download_src(nlohmann_json.natvis 9bce6758db0e54777394a4e718e60a281952b15f0c6dc6a6ad4a6d023c958b5515b2d39b7d4c66c03f0d3fdfdc1d6c23afb8b8419f1345c9d44d7b9a9ee2582b)
download_src(cmake/config.cmake.in 7caab6166baa891f77f5b632ac4a920e548610ec41777b885ec51fe68d3665ffe91984dd2881caf22298b5392dfbd84b526fda252467bb66de9eb90e6e6ade5a)
download_src(cmake/pkg-config.pc.in 34afe9f9ef9c77c9053f81bdc5605523ba5c20ca1bc2e0cb26afe1754362b25e88d809df47cdd63024c60f346240010a6aa343ff46d6a959a38612b3f1955664)
download_src(cmake/nlohmann_jsonConfigVersion.cmake.in 3b3ca2cfe740ba9646e5976b1112ba37c229bf527959bfb47a5e6c2fcd5ba6b5626d3c2455c181fe41a72ec78500738e2950e4fe76a2e91ba2073ba01f5595a8)

vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/nlohmann/json/releases/download/v${SOURCE_VERSION}/include.zip"
FILENAME ${PORT}-v${SOURCE_VERSION}-include.zip
SHA512 f4453aced8d74cf7c65d038fdf8da1e2b2153a1c15e26c7f25394ab1ce81f78920dd30b418b1db4cbf3f934df0459024230700bdd943aad569b2525b6a26e5d0
SHA512 1e7c2755c444a4c4a9cff0d64a3e5a43ce16f61a7f44e49a5802f65c78c904d74ca766a790fe91421be2bf45f6f046178e7df5da2edbc006a9a8b13ea4ea6986
)
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH OUT_PATH
Expand Down
12 changes: 12 additions & 0 deletions ports/xeus/Fix-Compile-nlohmann-json.patch
View file
Open in desktop
@@ -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"
4 changes: 3 additions & 1 deletion ports/xeus/portfile.cmake
View file
Open in desktop
Expand Up @@ -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)
Expand Down