diff options
| author | Kevin Lu <6320810+kevinlul@users.noreply.github.com> | 2020-07-09 16:17:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-09 13:17:32 -0700 |
| commit | a6ba0da9840ae2e5ba2ec1abfc9c198bb7e72ea8 (patch) | |
| tree | b47bcc601331ba2d13176e8e6b77feb92e9f90f4 | |
| parent | d7be0683557cef90dc4a92d392c64ac0bd4f02c2 (diff) | |
| download | vcpkg-a6ba0da9840ae2e5ba2ec1abfc9c198bb7e72ea8.tar.gz vcpkg-a6ba0da9840ae2e5ba2ec1abfc9c198bb7e72ea8.zip | |
[nlohmann-json] Always install multiple headers to allow forward declarations (#12117)
* [nlohmann-json] Add multiple-headers feature
Closes #10795
* Update ports/nlohmann-json/portfile.cmake
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* [nlohmann-json] Make multiple headers always active
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
| -rw-r--r-- | ports/nlohmann-json/CONTROL | 1 | ||||
| -rw-r--r-- | ports/nlohmann-json/portfile.cmake | 19 |
2 files changed, 18 insertions, 2 deletions
diff --git a/ports/nlohmann-json/CONTROL b/ports/nlohmann-json/CONTROL index 603129847..3e8f51fa6 100644 --- a/ports/nlohmann-json/CONTROL +++ b/ports/nlohmann-json/CONTROL @@ -1,4 +1,5 @@ Source: nlohmann-json Version: 3.8.0 +Port-Version: 2 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 344276a29..1f5f8575c 100644 --- a/ports/nlohmann-json/portfile.cmake +++ b/ports/nlohmann-json/portfile.cmake @@ -18,12 +18,27 @@ download_src(LICENSE.MIT d5f7bb6a33469e19250a5e20db44e7ba09602ee85bc0afb03e49324 download_src(nlohmann_json.natvis 9bce6758db0e54777394a4e718e60a281952b15f0c6dc6a6ad4a6d023c958b5515b2d39b7d4c66c03f0d3fdfdc1d6c23afb8b8419f1345c9d44d7b9a9ee2582b) download_src(cmake/config.cmake.in 7caab6166baa891f77f5b632ac4a920e548610ec41777b885ec51fe68d3665ffe91984dd2881caf22298b5392dfbd84b526fda252467bb66de9eb90e6e6ade5a) download_src(cmake/nlohmann_jsonConfigVersion.cmake.in 3b3ca2cfe740ba9646e5976b1112ba37c229bf527959bfb47a5e6c2fcd5ba6b5626d3c2455c181fe41a72ec78500738e2950e4fe76a2e91ba2073ba01f5595a8) -download_src(single_include/nlohmann/json.hpp 6643748f7d96196e7b5659f39762a839e509da3352787ced29d62c28be18dd74b53bc2601cae3c765117ba3cb23aed491de9766ea66dd2539894f77073d0398d) + +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 +) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH OUT_PATH + ARCHIVE ${ARCHIVE} + REF ${SOURCE_VERSION} + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} + NO_REMOVE_ONE_LEVEL +) +file(COPY "${OUT_PATH}/include" DESTINATION ${SOURCE_PATH}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS -DJSON_BuildTests=0 + OPTIONS + -DJSON_BuildTests=0 + -DJSON_MultipleHeaders=ON ) vcpkg_install_cmake() |