From 2862d571e3fe4f97eb3fb5e4e5b3bd25d562c4eb Mon Sep 17 00:00:00 2001 From: John Farrier Date: Sat, 20 Mar 2021 12:30:11 -0400 Subject: [PATCH 1/7] [celero] Updated to Celero v2.8.0 --- ports/celero/CONTROL | 2 +- ports/celero/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/celero/CONTROL b/ports/celero/CONTROL index 2e3327dbdf9881..05c02e6598ab6b 100644 --- a/ports/celero/CONTROL +++ b/ports/celero/CONTROL @@ -1,4 +1,4 @@ Source: celero -Version: 2.7.2 +Version: 2.8.0 Homepage: https://github.com/DigitalInBlue/Celero 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 c2eb0b04025556..4d9c18ba0150a5 100644 --- a/ports/celero/portfile.cmake +++ b/ports/celero/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DigitalInBlue/Celero - REF b9bbe63ebc464f799676cd4c696b376296178d63 #2.7.2 - SHA512 00a93c433b99a2c918741350c3fbfad67e4fe239948497de33fea2f13c8666e4fe37caf9f0e92d3c04dcb8b5c5e12501b199de3e69bbcf4f321c57a7c086e228 + REF 2249c9173b62e3f740b6920dd9567c2c87d0bde1 #2.8.0 + SHA512 ee5fc1934ab6d5faa2758a558fd0c14066d77c6ce29b0d61204d2896fb280dd03896e022804c7e2368516a660dc06ced40cea6d5d0b8ab6b810866c5f389611a HEAD_REF master ) From 86f59035cfc820424df54dca6558fe90d5ce6aa6 Mon Sep 17 00:00:00 2001 From: John Farrier Date: Sat, 20 Mar 2021 12:48:27 -0400 Subject: [PATCH 2/7] [celero] Improving static linking support in VCPKG. Celero issue #154 is tracking a fix. https://github.com/DigitalInBlue/Celero/issues/154 --- ports/celero/portfile.cmake | 4 ---- scripts/ci.baseline.txt | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ports/celero/portfile.cmake b/ports/celero/portfile.cmake index 4d9c18ba0150a5..8c86f026982686 100644 --- a/ports/celero/portfile.cmake +++ b/ports/celero/portfile.cmake @@ -24,10 +24,6 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/celero/Export.h "ifdef CELERO_STATIC" "if 1") -endif() - file(RENAME ${CURRENT_PACKAGES_DIR}/share/celero/celero-target.cmake ${CURRENT_PACKAGES_DIR}/share/celero/celero-config.cmake) file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 36519bbef7664c..77370811a2b322 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -91,6 +91,7 @@ catch-classic:x64-windows-static-md=skip catch-classic:x86-windows = skip ccd:arm-uwp=fail ccd:x64-uwp=fail +celero:x64-windows-static-md=fail cello:arm-uwp=fail cello:x64-uwp=fail cfitsio:arm-uwp=fail From c7b2870787b8a3fdd1049caef531fa7e66d08357 Mon Sep 17 00:00:00 2001 From: John Farrier Date: Thu, 25 Mar 2021 19:39:49 -0400 Subject: [PATCH 3/7] [celero] Updated to v2.8.1 --- ports/celero/CONTROL | 2 +- ports/celero/portfile.cmake | 8 ++++++-- scripts/ci.baseline.txt | 1 - 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ports/celero/CONTROL b/ports/celero/CONTROL index 05c02e6598ab6b..e6f1cae5ee736f 100644 --- a/ports/celero/CONTROL +++ b/ports/celero/CONTROL @@ -1,4 +1,4 @@ Source: celero -Version: 2.8.0 +Version: 2.8.1 Homepage: https://github.com/DigitalInBlue/Celero 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 8c86f026982686..201e66490744bd 100644 --- a/ports/celero/portfile.cmake +++ b/ports/celero/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DigitalInBlue/Celero - REF 2249c9173b62e3f740b6920dd9567c2c87d0bde1 #2.8.0 - SHA512 ee5fc1934ab6d5faa2758a558fd0c14066d77c6ce29b0d61204d2896fb280dd03896e022804c7e2368516a660dc06ced40cea6d5d0b8ab6b810866c5f389611a + REF cde0c58bc0d48516289db72896347898398a133c #2.8.1 + SHA512 6d91aa7e10c855fddd55783e612e81ee486588b538be616a5e2048dbb23795ef45f79dfffc6942e76e87710fbeb3c6f71dc9a534a1ff552fe665636f4f433d5b HEAD_REF master ) @@ -24,6 +24,10 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/celero/Export.h "ifdef CELERO_STATIC" "if 1") +endif() + file(RENAME ${CURRENT_PACKAGES_DIR}/share/celero/celero-target.cmake ${CURRENT_PACKAGES_DIR}/share/celero/celero-config.cmake) file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 77370811a2b322..36519bbef7664c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -91,7 +91,6 @@ catch-classic:x64-windows-static-md=skip catch-classic:x86-windows = skip ccd:arm-uwp=fail ccd:x64-uwp=fail -celero:x64-windows-static-md=fail cello:arm-uwp=fail cello:x64-uwp=fail cfitsio:arm-uwp=fail From 281943fa907ea58dd4f8308108843f17df3bfbf8 Mon Sep 17 00:00:00 2001 From: John Farrier Date: Thu, 25 Mar 2021 19:45:44 -0400 Subject: [PATCH 4/7] [celero] Updated version for VCPKG. --- versions/baseline.json | 2 +- versions/c-/celero.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index e9a1417fd742ec..5abee9743b2402 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1121,7 +1121,7 @@ "port-version": 0 }, "celero": { - "baseline": "2.7.2", + "baseline": "2.8.1", "port-version": 0 }, "cello": { diff --git a/versions/c-/celero.json b/versions/c-/celero.json index a1baf67c079a36..3844c05bd069f9 100644 --- a/versions/c-/celero.json +++ b/versions/c-/celero.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "741736dbd2b4f0a38e85a6ecb6eb57b48e62f61e", + "version-string": "2.8.1", + "port-version": 0 + }, { "git-tree": "25d338809366c358afe158e52694be2a670ab054", "version-string": "2.7.2", From a75bf6de8910aa828325e797e80c2f8c0ee54290 Mon Sep 17 00:00:00 2001 From: John Farrier Date: Thu, 25 Mar 2021 20:36:44 -0400 Subject: [PATCH 5/7] [celero] Updates to better support VCPKG. --- ports/celero/CONTROL | 2 +- ports/celero/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/celero/CONTROL b/ports/celero/CONTROL index e6f1cae5ee736f..d61655b2d5d581 100644 --- a/ports/celero/CONTROL +++ b/ports/celero/CONTROL @@ -1,4 +1,4 @@ Source: celero -Version: 2.8.1 +Version: 2.8.2 Homepage: https://github.com/DigitalInBlue/Celero 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 201e66490744bd..e39bac92d716df 100644 --- a/ports/celero/portfile.cmake +++ b/ports/celero/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DigitalInBlue/Celero - REF cde0c58bc0d48516289db72896347898398a133c #2.8.1 - SHA512 6d91aa7e10c855fddd55783e612e81ee486588b538be616a5e2048dbb23795ef45f79dfffc6942e76e87710fbeb3c6f71dc9a534a1ff552fe665636f4f433d5b + REF 6208b63dcd4baeea6817d3e84f79fb04ad99c720 #2.8.2 + SHA512 13a486dafba394cc3e072292008d00e8a3e1b12b4fe7c82cf2ce43b3d24629d08b5762494c19da0a12b186a70114cba101553ed1b4cea90d090514307b06dec8 HEAD_REF master ) From db3b03dfec7d4c520320d3ec0e3aabb50de8af42 Mon Sep 17 00:00:00 2001 From: John Farrier Date: Thu, 25 Mar 2021 20:46:06 -0400 Subject: [PATCH 6/7] [celero] Updated versions. --- versions/baseline.json | 2 +- versions/c-/celero.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 5abee9743b2402..63946252aed15d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1121,7 +1121,7 @@ "port-version": 0 }, "celero": { - "baseline": "2.8.1", + "baseline": "2.8.2", "port-version": 0 }, "cello": { diff --git a/versions/c-/celero.json b/versions/c-/celero.json index 3844c05bd069f9..e099ec522dba94 100644 --- a/versions/c-/celero.json +++ b/versions/c-/celero.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a170553c57f438bdab8cde9f4c6494e774763681", + "version-string": "2.8.2", + "port-version": 0 + }, { "git-tree": "741736dbd2b4f0a38e85a6ecb6eb57b48e62f61e", "version-string": "2.8.1", From 7e4e9f079735d6bc9c0ad8925e44734ad3dd462d Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 30 Mar 2021 09:27:28 +0800 Subject: [PATCH 7/7] Update celero.json --- versions/c-/celero.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/versions/c-/celero.json b/versions/c-/celero.json index e099ec522dba94..2a6b5c3d8d2404 100644 --- a/versions/c-/celero.json +++ b/versions/c-/celero.json @@ -5,11 +5,6 @@ "version-string": "2.8.2", "port-version": 0 }, - { - "git-tree": "741736dbd2b4f0a38e85a6ecb6eb57b48e62f61e", - "version-string": "2.8.1", - "port-version": 0 - }, { "git-tree": "25d338809366c358afe158e52694be2a670ab054", "version-string": "2.7.2",