From 6b6fa2ab379d718656c2a0aa3044fae7b941a6fa Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 17 Nov 2017 15:46:20 -0800 Subject: [PATCH] [date] Update to 2.3 --- ports/date/CMakeLists.txt | 6 +++--- ports/date/CONTROL | 2 +- ports/date/portfile.cmake | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ports/date/CMakeLists.txt b/ports/date/CMakeLists.txt index 91fcab1c7..c1efc4e2a 100644 --- a/ports/date/CMakeLists.txt +++ b/ports/date/CMakeLists.txt @@ -8,9 +8,9 @@ endif() add_definitions(-DNOMINMAX) -include_directories(".") +include_directories("./include") -add_library(tz tz.cpp) +add_library(tz src/tz.cpp) if(BUILD_SHARED_LIBS) target_compile_definitions(tz PRIVATE -DDATE_BUILD_DLL) @@ -26,5 +26,5 @@ install( ) if(NOT DISABLE_INSTALL_HEADERS) - install(FILES date.h tz.h julian.h iso_week.h islamic.h DESTINATION include) + install(FILES include/date/date.h include/date/tz.h include/date/julian.h include/date/iso_week.h include/date/islamic.h DESTINATION include/date) endif() diff --git a/ports/date/CONTROL b/ports/date/CONTROL index 8eab618c2..a2e7c6e69 100644 --- a/ports/date/CONTROL +++ b/ports/date/CONTROL @@ -1,3 +1,3 @@ Source: date -Version: 2.2 +Version: 2.3 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 f73c72b52..0001bbe6b 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 272d487b3d490126e520b67fe76bbb2e67226c07 - SHA512 59e8ff642d3eb82cb6116a77d4c5e14bbc2ae6bd4019e64a49609b6e46d679c2cb4ccae74807b72223aed18ae015596193919cdb58b011bfb774ff3e29a1d43b + REF 2.3 + SHA512 d629f2fb1403913ed276bec9c6fd72b8eb16067663e188b7be0c22c2621332f5b46f1eed166874b7a27f90b08fca8a5509b49f395611a1af5ca73385953e3abe HEAD_REF master ) @@ -25,7 +25,7 @@ vcpkg_install_cmake() vcpkg_copy_pdbs() -set(HEADER "${CURRENT_PACKAGES_DIR}/include/tz.h") +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}")