aboutsummaryrefslogtreecommitdiff
path: root/ports/celero
diff options
context:
space:
mode:
authorWimok Nupphiboon <wimok.mok@gmail.com>2018-04-22 20:35:52 +0700
committerWimok Nupphiboon <wimok.mok@gmail.com>2018-04-22 20:35:52 +0700
commitbefd3c6be2db90e5bc3a7acb2b0103cb6dfd7b42 (patch)
treefd4cfee016003e6be2898ac5d37f679a567cad76 /ports/celero
parent4c028691c7f03335f6fb8a38ce80794c213819cb (diff)
parent4f52f53b99f6a5465157958bc99f79cc0b2712ad (diff)
downloadvcpkg-befd3c6be2db90e5bc3a7acb2b0103cb6dfd7b42.tar.gz
vcpkg-befd3c6be2db90e5bc3a7acb2b0103cb6dfd7b42.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'ports/celero')
-rw-r--r--ports/celero/CONTROL2
-rw-r--r--ports/celero/portfile.cmake11
2 files changed, 8 insertions, 5 deletions
diff --git a/ports/celero/CONTROL b/ports/celero/CONTROL
index d40c93783..6180230dd 100644
--- a/ports/celero/CONTROL
+++ b/ports/celero/CONTROL
@@ -1,3 +1,3 @@
Source: celero
-Version: 2.1.0-1
+Version: 2.1.0-2
Description: Celero is a modern cross-platform (Windows, Linux, MacOS) Microbenchmarking library for C++.
diff --git a/ports/celero/portfile.cmake b/ports/celero/portfile.cmake
index c942ca5d8..0800115ec 100644
--- a/ports/celero/portfile.cmake
+++ b/ports/celero/portfile.cmake
@@ -5,12 +5,11 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
set(VCPKG_LIBRARY_LINKAGE static)
endif()
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO DigitalInBlue/Celero
- REF v2.1.0
- SHA512 30563567255b09a2c810d97896839589ed99d45b6c8d075fd16d1a0068457d70195a199f5c982c84784c2e03284c1eaac565253fa72b81d9e2d4102721b80221
+ REF v2.2.0
+ SHA512 6fac1fa949b18caabf59f3675c6e592cfadc3efa5e674b1f8b183e728ec880a4f5616d5d41c97f8fc26ef9520284188f519b7634209d0a56fb38a6993a9e9680
HEAD_REF master
)
@@ -24,6 +23,10 @@ vcpkg_configure_cmake(
)
vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH share)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
+
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/celero/celero-target.cmake ${CURRENT_PACKAGES_DIR}/share/celero/celero-config.cmake)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/celero RENAME copyright)