3 files changed, 35 insertions, 29 deletions
diff --git a/ports/cctz/CMakeLists.txt b/ports/cctz/CMakeLists.txt
index af557830c..e21b1ca68 100644
--- a/ports/cctz/CMakeLists.txt
+++ b/ports/cctz/CMakeLists.txt
@@ -4,7 +4,6 @@ project(cctz CXX)
 set(CMAKE_CXX_STANDARD 14)
 
 set(CMAKE_DEBUG_POSTFIX d)
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
 if(CMAKE_BUILD_TYPE STREQUAL "Release")
     option(INSTALL_HEADERS "Install header files" ON)
@@ -12,6 +11,8 @@ else()
     option(INSTALL_HEADERS "Install header files" OFF)
 endif()
 
+find_package(benchmark CONFIG REQUIRED)
+
 file(GLOB SOURCES src/*.cc)
 list(FILTER SOURCES EXCLUDE REGEX "_test.cc$|benchmarks|_tool.cc$")
 
@@ -19,6 +20,7 @@ file(GLOB HEADERS include/cctz/*.h)
 
 add_library(cctz ${SOURCES})
 target_include_directories(cctz PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include>)
+target_link_libraries(cctz PRIVATE benchmark::benchmark benchmark::benchmark_main)
 
 if(INSTALL_HEADERS)
     install(FILES ${HEADERS} DESTINATION "include/cctz")
diff --git a/ports/cctz/CONTROL b/ports/cctz/CONTROL
index be0bf9602..2934951b4 100644
--- a/ports/cctz/CONTROL
+++ b/ports/cctz/CONTROL
@@ -1,3 +1,4 @@
 Source: cctz
-Version: 2.2
+Version: 2.3-2
+Build-Depends: benchmark
 Description: two libraries that cooperate with <chrono> to give C++ programmers all the necessary tools for computing with dates, times, and time zones in a simple and correct manner.
diff --git a/ports/cctz/portfile.cmake b/ports/cctz/portfile.cmake
index d243e1e65..d429e7f52 100644
--- a/ports/cctz/portfile.cmake
+++ b/ports/cctz/portfile.cmake
@@ -1,27 +1,30 @@
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    message(FATAL_ERROR "${PORT} does not currently support UWP")
-endif()
-
-include(vcpkg_common_functions)
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO google/cctz
-    REF v2.2
-    SHA512 27a9116721a78aff4f692499a48b48ddab7210216b84cff4192414c3e769fede4018118422676981a41ccd09e517a0892d6d732ed7e347ac5e4026ae64999fa4
-    HEAD_REF master
-)
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-)
-
-vcpkg_install_cmake()
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-cctz TARGET_PATH share/unofficial-cctz)
-
-vcpkg_copy_pdbs()
-
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/cctz RENAME copyright)
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    message(FATAL_ERROR "${PORT} does not currently support UWP")
+endif()
+
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO google/cctz
+    REF v2.3
+    SHA512 e688ddac1bff108e8315bf94cb61483b72b0d16f601e4e1eeb0fd5c064aefe5a573eee66e8903401aa4c2be71ea9f10dd6c9a9cdf8379f5bb6073248a21a83ff
+    HEAD_REF master
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-cctz TARGET_PATH share/unofficial-cctz)
+
+vcpkg_copy_pdbs()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/cctz RENAME copyright)