diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-06-14 23:06:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-14 23:06:32 -0700 |
| commit | 748e8b6e7495f06253eb21236bf3abf38b897b63 (patch) | |
| tree | 819d6fcf1458e2ee4206434083e3db12bcd3724f | |
| parent | f7321cf27a4bf809c4896b5cea24dde394305c63 (diff) | |
| parent | 2752e690b9230e8078d0688f0b9830874d0662df (diff) | |
| download | vcpkg-748e8b6e7495f06253eb21236bf3abf38b897b63.tar.gz vcpkg-748e8b6e7495f06253eb21236bf3abf38b897b63.zip | |
Merge pull request #1285 from codicodi/fmt
[fmt] update to 3.0.2
| -rw-r--r-- | ports/fmt/CONTROL | 2 | ||||
| -rw-r--r-- | ports/fmt/portfile.cmake | 26 |
2 files changed, 9 insertions, 19 deletions
diff --git a/ports/fmt/CONTROL b/ports/fmt/CONTROL index 4e980b4d5..e5749ab1f 100644 --- a/ports/fmt/CONTROL +++ b/ports/fmt/CONTROL @@ -1,3 +1,3 @@ Source: fmt -Version: 3.0.1-4 +Version: 3.0.2 Description: Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams. diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index 959a0ebe7..49728fbe0 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -1,15 +1,11 @@ -#if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) -# message(STATUS "Warning: Dynamic building not supported yet. Building static.") -# set(VCPKG_LIBRARY_LINKAGE static) -#endif() include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/fmt-3.0.1) -vcpkg_download_distfile(ARCHIVE_FILE - URLS "https://github.com/fmtlib/fmt/archive/3.0.1.tar.gz" - FILENAME "fmt-3.0.1.tar.gz" - SHA512 daf5dfb2fe63eb611983fa248bd2182c6202cf1c4f0fc236f357040fce8e87ad531cdf59090306bb313ea333d546e516f467b385e05094e696d0ca091310aad6 +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO fmtlib/fmt + REF 3.0.2 + SHA512 50f5a25d1a10fd5b265f3811fa11886b9efdae2952f2aefc9f22c87c1a748128369f4d530b320e5e9c67c745cdab4607d1cb08940f4cf968300dee22e1150117 + HEAD_REF master ) -vcpkg_extract_source_archive(${ARCHIVE_FILE}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -18,10 +14,8 @@ vcpkg_configure_cmake( -DFMT_CMAKE_DIR=share/fmt -DFMT_TEST=OFF -DFMT_DOC=OFF - -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON ) - vcpkg_install_cmake() file(INSTALL ${SOURCE_PATH}/LICENSE.rst DESTINATION ${CURRENT_PACKAGES_DIR}/share/fmt RENAME copyright) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) @@ -36,12 +30,8 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(WRITE ${CURRENT_PACKAGES_DIR}/include/fmt/format.h "${FMT_FORMAT_H}") endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -#file(REMOVE ${CURRENT_PACKAGES_DIR}/include/fmt/format.cc) -#file(REMOVE ${CURRENT_PACKAGES_DIR}/include/fmt/ostream.cc) -file(RENAME ${CURRENT_PACKAGES_DIR}/debug/share/fmt/fmt-targets-debug.cmake ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake) -file(READ ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake FMT_DEBUG_MODULE) -string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" FMT_DEBUG_MODULE "${FMT_DEBUG_MODULE}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake "${FMT_DEBUG_MODULE}") + +vcpkg_fixup_cmake_targets() file(READ ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake FMT_DEBUG_MODULE) string(REPLACE "lib/fmt.dll" "bin/fmt.dll" FMT_DEBUG_MODULE ${FMT_DEBUG_MODULE}) |