From d27cefc0681aea4004ecca88990fdd1ab9d2ecda Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Tue, 16 Jun 2020 01:42:25 -0700 Subject: [PATCH] [date] Update to 3.0.0 --- ports/date/0002-fix-cmake-3.14.patch | 33 ++++++++++++++-------------- ports/date/CONTROL | 2 +- ports/date/portfile.cmake | 23 +++++++++---------- 3 files changed, 28 insertions(+), 30 deletions(-) diff --git a/ports/date/0002-fix-cmake-3.14.patch b/ports/date/0002-fix-cmake-3.14.patch index de5ec1bd3cc88b..9d117231ca3503 100644 --- a/ports/date/0002-fix-cmake-3.14.patch +++ b/ports/date/0002-fix-cmake-3.14.patch @@ -1,24 +1,25 @@ -diff --git i/CMakeLists.txt w/CMakeLists.txt -index 885e424..b9e0b43 100644 ---- i/CMakeLists.txt -+++ w/CMakeLists.txt -@@ -72,7 +72,6 @@ target_sources( date INTERFACE +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ad74900..42d55af 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -72,7 +72,7 @@ target_sources( date INTERFACE + $ $ ) - # public headers will get installed: --set_target_properties( date PROPERTIES PUBLIC_HEADER include/date/date.h ) - target_compile_definitions( date INTERFACE - #To workaround libstdc++ issue https://github.com/HowardHinnant/date/issues/388 - ONLY_C_LOCALE=$,1,0> -@@ -112,7 +111,6 @@ if( BUILD_TZ_LIB ) +-if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.15) ++if (0) + # public headers will get installed: + set_target_properties( date PROPERTIES PUBLIC_HEADER include/date/date.h ) + endif () +@@ -115,7 +115,6 @@ if( BUILD_TZ_LIB ) endif( ) - set_target_properties( tz PROPERTIES + set_target_properties( date-tz PROPERTIES POSITION_INDEPENDENT_CODE ON - PUBLIC_HEADER "${TZ_HEADERS}" VERSION "${PROJECT_VERSION}" SOVERSION "${PROJECT_VERSION}" ) if( NOT MSVC ) -@@ -136,8 +134,8 @@ write_basic_package_version_file( "${version_config}" +@@ -140,8 +139,8 @@ write_basic_package_version_file( "${version_config}" COMPATIBILITY SameMajorVersion ) install( TARGETS date @@ -26,6 +27,6 @@ index 885e424..b9e0b43 100644 - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/date ) + EXPORT dateConfig ) +install( FILES include/date/date.h ${TZ_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/date ) - export( TARGETS date NAMESPACE date:: FILE dateConfig.cmake ) - - if( BUILD_TZ_LIB ) + export( TARGETS date NAMESPACE date:: FILE dateTargets.cmake ) + if (CMAKE_VERSION VERSION_LESS 3.15) + install( diff --git a/ports/date/CONTROL b/ports/date/CONTROL index 7aaa8a8237617b..c912bd283e9856 100644 --- a/ports/date/CONTROL +++ b/ports/date/CONTROL @@ -1,5 +1,5 @@ Source: date -Version: 2019-11-08 +Version: 3.0.0 Homepage: https://github.com/HowardHinnant/date Description: A date and time library based on the C++17 header diff --git a/ports/date/portfile.cmake b/ports/date/portfile.cmake index 28c723a5f73e22..3fd9121c4b346c 100644 --- a/ports/date/portfile.cmake +++ b/ports/date/portfile.cmake @@ -1,6 +1,4 @@ -include(vcpkg_common_functions) - -if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") +if(VCPKG_TARGET_IS_WINDOWS) message(WARNING "You will need to also install https://raw.githubusercontent.com/unicode-org/cldr/master/common/supplemental/windowsZones.xml into your install location.\n" "See https://howardhinnant.github.io/date/tz.html" @@ -10,25 +8,24 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO HowardHinnant/date - REF 3e376be2e9b4d32c946bd83c22601e4b7a1ce421 - SHA512 9dad181f8544bfcff8c42200552b6673e537c53b34fbad11663d6435d4e5fd5a3ac6cabbb76312481c9784b237151d9ccd161bb1b8c54c563fa75073896f3cff + REF cac99da8dc88be719a728dc1b597b0ac307c1800 #3.0.0 + SHA512 07bac40c9d92ed92f05ab71b07c203fc341cd35999f1eab16d584bf77ff69e2cdc106931b2faf0dcfc5a311ee55e8445a81fd97c62f4672957b6aac1b24a08fd HEAD_REF master PATCHES - "${CMAKE_CURRENT_LIST_DIR}/0001-fix-uwp.patch" - "${CMAKE_CURRENT_LIST_DIR}/0002-fix-cmake-3.14.patch" + 0001-fix-uwp.patch + 0002-fix-cmake-3.14.patch +) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + remote-api USE_SYSTEM_TZ_DB ) - -set(DATE_USE_SYSTEM_TZ_DB 1) -if("remote-api" IN_LIST FEATURES) - set(DATE_USE_SYSTEM_TZ_DB 0) -endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS + ${FEATURE_OPTIONS} -DBUILD_TZ_LIB=ON - -DUSE_SYSTEM_TZ_DB=${DATE_USE_SYSTEM_TZ_DB} ) vcpkg_install_cmake()