Skip to content

[celero] Updated to Celero v2.8.0#16802

Merged
ras0219-msft merged 7 commits intomicrosoft:masterfrom
DigitalInBlue:master
Apr 2, 2021
Merged

[celero] Updated to Celero v2.8.0#16802
ras0219-msft merged 7 commits intomicrosoft:masterfrom
DigitalInBlue:master

Conversation

@DigitalInBlue
Copy link
Contributor

  • Updates Celero to v2.8.0

@autoantwort
Copy link
Contributor

You have to run ./vcpkg x-add-version celero and commit the result to make the pipeline happy :)

@JackBoosY JackBoosY added the category:port-update The issue is with a library, which is requesting update new revision label Mar 22, 2021
Comment on lines -27 to -30
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/celero/Export.h "ifdef CELERO_STATIC" "if 1")
endif()

Copy link
Contributor

Choose a reason for hiding this comment

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

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

Copy link
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.

Copy link
Contributor

Choose a reason for hiding this comment

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

@DigitalInBlue ,This function will affect the use of celero port, please restore it

catch-classic:x86-windows = skip
ccd:arm-uwp=fail
ccd:x64-uwp=fail
celero:x64-windows-static-md=fail
Copy link
Contributor

@JonLiu1993 JonLiu1993 Mar 24, 2021

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?

@DigitalInBlue
Copy link
Contributor Author

I "think" this is good. The failures seem to be due to osgEarth, which is not a dependency of Celero.

2021-03-26T00:52:33.1927848Z Error: Building package osgearth:x64-linux failed with: BUILD_FAILED

@DigitalInBlue
Copy link
Contributor Author

@JonLiu1993 Please review for merging.

@JonLiu1993 JonLiu1993 added info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. and removed requires:author-response labels Mar 30, 2021
@ras0219-msft ras0219-msft merged commit 030cfaa into microsoft:master Apr 2, 2021
@ras0219-msft
Copy link
Contributor

LGTM, thanks for the update!

prateek9623 added a commit to prateek9623/vcpkg that referenced this pull request Apr 7, 2021
* [celero] Updated to Celero v2.8.0

* [celero] Improving static linking support in VCPKG.

Celero issue microsoft#154 is tracking a fix.
DigitalInBlue/Celero#154

* [celero] Updated to v2.8.1

* [celero] Updated version for VCPKG.

* [celero] Updates to better support VCPKG.

* [celero] Updated versions.

* Update celero.json

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
vicroms pushed a commit that referenced this pull request Apr 9, 2021
* [minizip-ng] add new port

* [celero] Updated to Celero v2.8.0 (#16802)

* [celero] Updated to Celero v2.8.0

* [celero] Improving static linking support in VCPKG.

Celero issue #154 is tracking a fix.
DigitalInBlue/Celero#154

* [celero] Updated to v2.8.1

* [celero] Updated version for VCPKG.

* [celero] Updates to better support VCPKG.

* [celero] Updated versions.

* Update celero.json

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

category:port-update The issue is with a library, which is requesting update new revision info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants