[fmt] update to 3.0.2

This commit is contained in:
codicodi 2017-06-15 00:55:26 +02:00
parent c5ac989899
commit 2752e690b9
2 changed files with 9 additions and 19 deletions

View File

@ -1,3 +1,3 @@
Source: fmt 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. Description: Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.

View File

@ -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) include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/fmt-3.0.1) vcpkg_from_github(
vcpkg_download_distfile(ARCHIVE_FILE OUT_SOURCE_PATH SOURCE_PATH
URLS "https://github.com/fmtlib/fmt/archive/3.0.1.tar.gz" REPO fmtlib/fmt
FILENAME "fmt-3.0.1.tar.gz" REF 3.0.2
SHA512 daf5dfb2fe63eb611983fa248bd2182c6202cf1c4f0fc236f357040fce8e87ad531cdf59090306bb313ea333d546e516f467b385e05094e696d0ca091310aad6 SHA512 50f5a25d1a10fd5b265f3811fa11886b9efdae2952f2aefc9f22c87c1a748128369f4d530b320e5e9c67c745cdab4607d1cb08940f4cf968300dee22e1150117
HEAD_REF master
) )
vcpkg_extract_source_archive(${ARCHIVE_FILE})
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
@ -18,10 +14,8 @@ vcpkg_configure_cmake(
-DFMT_CMAKE_DIR=share/fmt -DFMT_CMAKE_DIR=share/fmt
-DFMT_TEST=OFF -DFMT_TEST=OFF
-DFMT_DOC=OFF -DFMT_DOC=OFF
-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
) )
vcpkg_install_cmake() vcpkg_install_cmake()
file(INSTALL ${SOURCE_PATH}/LICENSE.rst DESTINATION ${CURRENT_PACKAGES_DIR}/share/fmt RENAME copyright) file(INSTALL ${SOURCE_PATH}/LICENSE.rst DESTINATION ${CURRENT_PACKAGES_DIR}/share/fmt RENAME copyright)
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) 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}") file(WRITE ${CURRENT_PACKAGES_DIR}/include/fmt/format.h "${FMT_FORMAT_H}")
endif() endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) 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) vcpkg_fixup_cmake_targets()
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}")
file(READ ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake FMT_DEBUG_MODULE) 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}) string(REPLACE "lib/fmt.dll" "bin/fmt.dll" FMT_DEBUG_MODULE ${FMT_DEBUG_MODULE})