aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJackBoosY <47264268+JackBoosY@users.noreply.github.com>2019-04-26 03:39:38 +0800
committerGriffin Downs <35574547+grdowns@users.noreply.github.com>2019-04-25 12:39:38 -0700
commit7aae74af08f32234f56675e9f9b9cad4213cdf5b (patch)
tree22604e3773a300a4e87ad547d43f77e712829999
parentaf3dd1acd1ec12775b2c8d095d4ef065d29a7df0 (diff)
downloadvcpkg-7aae74af08f32234f56675e9f9b9cad4213cdf5b.tar.gz
vcpkg-7aae74af08f32234f56675e9f9b9cad4213cdf5b.zip
[cctz]Update cctz to v2.3 and add dependence benchmark. (#6185)
-rw-r--r--ports/cctz/CMakeLists.txt3
-rw-r--r--ports/cctz/CONTROL3
-rw-r--r--ports/cctz/portfile.cmake4
3 files changed, 7 insertions, 3 deletions
diff --git a/ports/cctz/CMakeLists.txt b/ports/cctz/CMakeLists.txt
index af557830c..9a8cd3071 100644
--- a/ports/cctz/CMakeLists.txt
+++ b/ports/cctz/CMakeLists.txt
@@ -12,6 +12,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 +21,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..6dccfd87d 100644
--- a/ports/cctz/CONTROL
+++ b/ports/cctz/CONTROL
@@ -1,3 +1,4 @@
Source: cctz
-Version: 2.2
+Version: 2.3
+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..a373d43c4 100644
--- a/ports/cctz/portfile.cmake
+++ b/ports/cctz/portfile.cmake
@@ -6,8 +6,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO google/cctz
- REF v2.2
- SHA512 27a9116721a78aff4f692499a48b48ddab7210216b84cff4192414c3e769fede4018118422676981a41ccd09e517a0892d6d732ed7e347ac5e4026ae64999fa4
+ REF v2.3
+ SHA512 e688ddac1bff108e8315bf94cb61483b72b0d16f601e4e1eeb0fd5c064aefe5a573eee66e8903401aa4c2be71ea9f10dd6c9a9cdf8379f5bb6073248a21a83ff
HEAD_REF master
)