diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-01-25 14:54:34 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-25 14:54:34 -0800 |
| commit | 61d163a8fcdfec87ae90efbb9b107c3b0372492c (patch) | |
| tree | 336f679552bb7ec49aad7eadd1c9d9e11d0a053f | |
| parent | 4489853deeb6d7ebe172a20dfd037a810b1a444e (diff) | |
| parent | 7d9224c83ec746e612b6eacdbe91e4bf0e7b6b77 (diff) | |
| download | vcpkg-61d163a8fcdfec87ae90efbb9b107c3b0372492c.tar.gz vcpkg-61d163a8fcdfec87ae90efbb9b107c3b0372492c.zip | |
Merge pull request #5175 from myd7349/spdlog-issue-5143
[spdlog] Fix #5143 and update to 1.3.1
| -rw-r--r-- | ports/spdlog/CONTROL | 2 | ||||
| -rw-r--r-- | ports/spdlog/portfile.cmake | 15 |
2 files changed, 14 insertions, 3 deletions
diff --git a/ports/spdlog/CONTROL b/ports/spdlog/CONTROL index 6214deb4d..801cd3697 100644 --- a/ports/spdlog/CONTROL +++ b/ports/spdlog/CONTROL @@ -1,4 +1,4 @@ Source: spdlog -Version: 1.3.0 +Version: 1.3.1 Description: Very fast, header only, C++ logging library Build-Depends: fmt diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index ccc961b18..530e8b084 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gabime/spdlog - REF v1.3.0 - SHA512 019a52d4b6c66287ee2a6e8177457ecbbb78e1cb894f4a0a90b83a84d66cd37b397cdf77892d9116e4c34113bd3277d606d578bc96ec6521ae7745f08b1aa54f + REF v1.3.1 + SHA512 a851a44b6384f493dd312ae0a611d068af46bbfe8daf1c2f61f13d8836a3801f41b339074fbe8da8e428131c82fa5c4a9e3320a55cbdd4b7aff8bb349dfff7dd HEAD_REF v1.x PATCHES disable-master-project-check.patch @@ -27,6 +27,17 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) # use vcpkg-provided fmt library (see also option SPDLOG_FMT_EXTERNAL above) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/spdlog/fmt/bundled) +vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/fmt/fmt.h + "#if !defined(SPDLOG_FMT_EXTERNAL)" + "#if 0 // !defined(SPDLOG_FMT_EXTERNAL)" +) + +vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/fmt/ostr.h + "#if !defined(SPDLOG_FMT_EXTERNAL)" + "#if 0 // !defined(SPDLOG_FMT_EXTERNAL)" +) + + # Handle copyright file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/spdlog) file(RENAME ${CURRENT_PACKAGES_DIR}/share/spdlog/LICENSE ${CURRENT_PACKAGES_DIR}/share/spdlog/copyright) |