From bfc50d8ee24f5a86b589d955a18d12a2c7d6343b Mon Sep 17 00:00:00 2001 From: Vitaliy Parinov Date: Thu, 11 Jan 2018 08:46:08 +0300 Subject: Update HowardHinnant/date to 2.4 --- ports/date/CONTROL | 2 +- ports/date/portfile.cmake | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/ports/date/CONTROL b/ports/date/CONTROL index 68fb435b6..8c1797072 100644 --- a/ports/date/CONTROL +++ b/ports/date/CONTROL @@ -1,3 +1,3 @@ Source: date -Version: 2.3-c286981b3bf83c79554769df68b27415cee68d77 +Version: 2.4 Description: A date and time library based on the C++11/14/17 header diff --git a/ports/date/portfile.cmake b/ports/date/portfile.cmake index a5270554f..14bae6195 100644 --- a/ports/date/portfile.cmake +++ b/ports/date/portfile.cmake @@ -8,8 +8,8 @@ message(WARNING vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO HowardHinnant/date - REF c286981b3bf83c79554769df68b27415cee68d77 - SHA512 226e2cbc2598fbbe3a451664b017ab5b4314a682a9303268bd531931ea23baa4c9677c4433a87dbbc4a7d960dcfad1fcb632ac430d5d81c9909bcc567cf7eadf + REF v2.4 + SHA512 01bcc021ebf9ca0ac88c797896a291ff81834e7fae37323ad20881d3a172963c04d3c7bea0dd37cd945b756ab7f70f0a02edb18a085bf9abf8d8f10056f73f3c HEAD_REF master ) @@ -25,14 +25,4 @@ vcpkg_install_cmake() vcpkg_copy_pdbs() -set(HEADER "${CURRENT_PACKAGES_DIR}/include/date/tz.h") -file(READ "${HEADER}" _contents) -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - string(REPLACE "DATE_BUILD_DLL" "1" _contents "${_contents}") -else() - string(REPLACE "DATE_BUILD_LIB" "1" _contents "${_contents}") -endif() -file(WRITE "${HEADER}" "${_contents}") - - file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/date RENAME copyright) -- cgit v1.2.3 From 60fb59ce4d0b205f06282b11768d0d04fde60eae Mon Sep 17 00:00:00 2001 From: Vitaliy Parinov Date: Fri, 12 Jan 2018 05:50:19 +0300 Subject: [date] Update to 2.4 cont. (removed DATE_BUILD_LIB usages) --- ports/date/CMakeLists.txt | 2 -- ports/date/portfile.cmake | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ports/date/CMakeLists.txt b/ports/date/CMakeLists.txt index c1efc4e2a..4c38e4a87 100644 --- a/ports/date/CMakeLists.txt +++ b/ports/date/CMakeLists.txt @@ -14,8 +14,6 @@ add_library(tz src/tz.cpp) if(BUILD_SHARED_LIBS) target_compile_definitions(tz PRIVATE -DDATE_BUILD_DLL) -else() - target_compile_definitions(tz PRIVATE -DDATE_BUILD_LIB) endif() install( diff --git a/ports/date/portfile.cmake b/ports/date/portfile.cmake index 14bae6195..e060edb87 100644 --- a/ports/date/portfile.cmake +++ b/ports/date/portfile.cmake @@ -25,4 +25,11 @@ vcpkg_install_cmake() vcpkg_copy_pdbs() +set(HEADER "${CURRENT_PACKAGES_DIR}/include/date/tz.h") +file(READ "${HEADER}" _contents) +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + string(REPLACE "ifdef DATE_BUILD_DLL" "if 1" _contents "${_contents}") +endif() +file(WRITE "${HEADER}" "${_contents}") + file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/date RENAME copyright) -- cgit v1.2.3