Skip to content

[celero] Updated to Celero v2.8.0 #16802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Robert Schumacher (ras0219-msft) merged 7 commits into from
Apr 2, 2021
Merged

[celero] Updated to Celero v2.8.0 #16802

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2862d57
[celero] Updated to Celero v2.8.0
DigitalInBlue Mar 20, 2021
86f5903
[celero] Improving static linking support in VCPKG.
DigitalInBlue Mar 20, 2021
c7b2870
[celero] Updated to v2.8.1
DigitalInBlue Mar 25, 2021
281943f
[celero] Updated version for VCPKG.
DigitalInBlue Mar 25, 2021
a75bf6d
[celero] Updates to better support VCPKG.
DigitalInBlue Mar 26, 2021
db3b03d
[celero] Updated versions.
DigitalInBlue Mar 26, 2021
7e4e9f0
Update celero.json
JonLiu1993 Mar 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/celero/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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++.
8 changes: 2 additions & 6 deletions ports/celero/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
)

Expand All @@ -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()

Comment on lines -27 to -30

@JonLiu1993 JonLiu1993 Mar 22, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

John Farrier (@DigitalInBlue), thanks for your pr, please tell me the reason for deleting this function.

@DigitalInBlue John Farrier (DigitalInBlue) Mar 24, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It wasn't documented. I did not observe any side-effects from removing it. If it is necessary, It can be added back in. I was merely trying to remove what I believed to be dead code.

@JonLiu1993 JonLiu1993 Mar 24, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

John Farrier (@DigitalInBlue) ,This function will affect the use of celero port, please restore it

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)
1 change: 1 addition & 0 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

@JonLiu1993 JonLiu1993 Mar 24, 2021 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested locally that the previous version of celero can compile x64-windows-static-md normally. your latest version not compile normally?

cello:arm-uwp=fail
cello:x64-uwp=fail
cfitsio:arm-uwp=fail
Expand Down