diff options
| author | thewhiteninja <40250307+thewhiteninja@users.noreply.github.com> | 2020-06-19 00:38:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-18 15:38:49 -0700 |
| commit | 2346dad99e02a71e2a3501c6391abbe6f5385564 (patch) | |
| tree | 0998782a02ba89e27452c8f9b85409e3d7fa0a77 | |
| parent | 5f237aa8a44a09fc2447366f2a07601a03491cd9 (diff) | |
| download | vcpkg-2346dad99e02a71e2a3501c6391abbe6f5385564.tar.gz vcpkg-2346dad99e02a71e2a3501c6391abbe6f5385564.zip | |
[nlohmann-json] Upgrade to 3.8.0 (#11941)
* [nlohmann-json] Upgrade to 3.8.0
* Replace hardcoded port name by the variable ${PORT}
* Replace all nlohmann-json by ${PORT}
| -rw-r--r-- | ports/nlohmann-json/CONTROL | 2 | ||||
| -rw-r--r-- | ports/nlohmann-json/portfile.cmake | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/ports/nlohmann-json/CONTROL b/ports/nlohmann-json/CONTROL index 5ad907cb6..603129847 100644 --- a/ports/nlohmann-json/CONTROL +++ b/ports/nlohmann-json/CONTROL @@ -1,4 +1,4 @@ Source: nlohmann-json -Version: 3.7.3 +Version: 3.8.0 Homepage: https://github.com/nlohmann/json Description: JSON for Modern C++ diff --git a/ports/nlohmann-json/portfile.cmake b/ports/nlohmann-json/portfile.cmake index 88c333507..344276a29 100644 --- a/ports/nlohmann-json/portfile.cmake +++ b/ports/nlohmann-json/portfile.cmake @@ -1,23 +1,24 @@ -set(SOURCE_VERSION 3.7.3) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/nlohmann-json-v${SOURCE_VERSION}) +set(SOURCE_VERSION 3.8.0) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${PORT}-v${SOURCE_VERSION}) file(MAKE_DIRECTORY ${SOURCE_PATH}) function(download_src SUBPATH SHA512) vcpkg_download_distfile(FILE URLS "https://github.com/nlohmann/json/raw/v${SOURCE_VERSION}/${SUBPATH}" - FILENAME "nlohmann-json-v${SOURCE_VERSION}/${SUBPATH}" + FILENAME "${PORT}-v${SOURCE_VERSION}/${SUBPATH}" SHA512 ${SHA512} ) get_filename_component(SUBPATH_DIR "${SOURCE_PATH}/${SUBPATH}" DIRECTORY) file(COPY ${FILE} DESTINATION ${SUBPATH_DIR}) endfunction() -download_src(CMakeLists.txt 11ba0b69282e636e496ab854334addd9a13537bddf644d551d67e71a9f5ca2f1fda640c175bed77c279348d72a42dbe00358f16d90defaf33e4a740c850f7d7d) -download_src(LICENSE.MIT 44e6d9510dd66195211aa8ce3e6eef55be524e82c5864f3bfb85f2ac1215529c8ca370c8746de61ad5739e5af1633a5985085dacd1ffe220cd21d06433936801) +download_src(CMakeLists.txt 18151b19cb5258e58feffac8d4aed559c87e158dc217f47be23351b15c86e1d3f3c5ad2f7d11beabe3f0c0f948f3da1b9a807d425b1a9a0bb1ed74767cefafa9) +download_src(LICENSE.MIT d5f7bb6a33469e19250a5e20db44e7ba09602ee85bc0afb03e4932402b08ca1c0dbbe6376b7e0a84eb11c782d70ae96f130755967204d35420c6ecbcafd301e5) download_src(nlohmann_json.natvis 9bce6758db0e54777394a4e718e60a281952b15f0c6dc6a6ad4a6d023c958b5515b2d39b7d4c66c03f0d3fdfdc1d6c23afb8b8419f1345c9d44d7b9a9ee2582b) download_src(cmake/config.cmake.in 7caab6166baa891f77f5b632ac4a920e548610ec41777b885ec51fe68d3665ffe91984dd2881caf22298b5392dfbd84b526fda252467bb66de9eb90e6e6ade5a) -download_src(single_include/nlohmann/json.hpp 4ecbbdd2c5e88c897096670cfdaa7ec00483ac9ed6e8ac33be23b05f4da70f213e10c4b381f5e8799619a24a58f417f04dd442d1d59a2e0bfca3385007e620d5) +download_src(cmake/nlohmann_jsonConfigVersion.cmake.in 3b3ca2cfe740ba9646e5976b1112ba37c229bf527959bfb47a5e6c2fcd5ba6b5626d3c2455c181fe41a72ec78500738e2950e4fe76a2e91ba2073ba01f5595a8) +download_src(single_include/nlohmann/json.hpp 6643748f7d96196e7b5659f39762a839e509da3352787ced29d62c28be18dd74b53bc2601cae3c765117ba3cb23aed491de9766ea66dd2539894f77073d0398d) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -48,4 +49,4 @@ if(EXISTS ${CURRENT_PACKAGES_DIR}/nlohmann_json.natvis) endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.MIT DESTINATION ${CURRENT_PACKAGES_DIR}/share/nlohmann-json RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE.MIT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) |