Skip to content

[cpu-features] Fixed and updated cpu-features.#18101

Merged
strega-nil-ms merged 3 commits intomicrosoft:masterfrom
WeiDaiWD:cpu-features
Jun 1, 2021
Merged

[cpu-features] Fixed and updated cpu-features.#18101
strega-nil-ms merged 3 commits intomicrosoft:masterfrom
WeiDaiWD:cpu-features

Conversation

@WeiDaiWD
Copy link
Contributor

@WeiDaiWD WeiDaiWD commented May 24, 2021

Describe the pull request

Updated cpu-features to version 0.6.0. Removed the executable target list_cpu_features when feature tools is not specified.

  • What does your PR fix?

    Port cpu-features is broken. If tools is not specified, calling find_package(CpuFeatures ...) fails, because an executable target is exported but deleted. This PR make the executable target optionally, via a patch.
    This is required to fix [hexl] Add new port #18043 .

  • Which triplets are supported/not supported? Have you updated the CI baseline?

    !(arm | uwp)
    Yes.

  • Does your PR follow the maintainer guide?

    Yes.

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

    Yes.

@WeiDaiWD
Copy link
Contributor Author

WeiDaiWD commented May 24, 2021

Is this a failure caused by pipeline or code change?

@WeiDaiWD WeiDaiWD mentioned this pull request May 24, 2021
Merged
@NancyLi1013 NancyLi1013 self-assigned this May 25, 2021
@NancyLi1013 NancyLi1013 added category:port-update The issue is with a library, which is requesting update new revision category:port-bug The issue is with a library, which is something the port should already support labels May 25, 2021
@NancyLi1013 NancyLi1013 changed the title Fixed and updated cpu-features. [cpu-features] Fixed and updated cpu-features. May 25, 2021
NancyLi1013
NancyLi1013 suggested changes May 25, 2021
View reviewed changes
@NancyLi1013
Copy link
Contributor

NancyLi1013 commented May 25, 2021 

cmake Error at ports/cpu-features/portfile.cmake:21 (vcpkg_cmake_configure):
  Unknown CMake command "vcpkg_cmake_configure".
Call Stack (most recent call first):
  scripts/ports.cmake:141 (include)

Can you merge master to this PR? It seems that you didn't use the latest commit.

@WeiDaiWD
Copy link
Contributor Author

WeiDaiWD commented May 25, 2021 

cmake Error at ports/cpu-features/portfile.cmake:21 (vcpkg_cmake_configure):
  Unknown CMake command "vcpkg_cmake_configure".
Call Stack (most recent call first):
  scripts/ports.cmake:141 (include)

Can you merge master to this PR? It seems that you didn't use the latest commit.

Done.

@WeiDaiWD
Copy link
Contributor Author

WeiDaiWD commented May 25, 2021

My mistakes. I forgot to add dependencies to vcpkg-cmake and vcpkg-cmake-config. I've rebased and squashed my changes into a single commit.

NancyLi1013
NancyLi1013 suggested changes May 26, 2021
View reviewed changes
Wei Dai and others added 3 commits May 25, 2021 21:35
Fixed and updated cpu-features.
cb0f11a
@NancyLi1013
Update ports/cpu-features/portfile.cmake
6505c65 
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Updated versioning.
177036a
@WeiDaiWD
Copy link
Contributor Author

WeiDaiWD commented May 26, 2021

Is this caused by changes to master?

@NancyLi1013
Copy link
Contributor

NancyLi1013 commented May 26, 2021

The problem caused by libtasn1 will be fixed in PR #18116. I will rerun this PR once fixed.

@WeiDaiWD
Copy link
Contributor Author

WeiDaiWD commented May 28, 2021

Is this PR ready to be merged?

@NancyLi1013
Copy link
Contributor

NancyLi1013 commented May 28, 2021

Have you tested the feature? @WeiDaiWD

@WeiDaiWD
Copy link
Contributor Author

WeiDaiWD commented May 28, 2021

I've just tested x64-linux, x86-windows, and x64-windows. All works with or without feature tools. And the generated executable (if the feature is requested) works correctly too.

@NancyLi1013 NancyLi1013 added info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. and removed requires:all-feature-testing labels May 28, 2021
@NancyLi1013
Copy link
Contributor

NancyLi1013 commented May 28, 2021

LGTM now, thanks for your fixing @WeiDaiWD

@strega-nil-ms
Copy link
Contributor

strega-nil-ms commented Jun 1, 2021

Awesome, thanks @WeiDaiWD!

@strega-nil-ms strega-nil-ms merged commit b2dd126 into microsoft:master Jun 1, 2021
@WeiDaiWD WeiDaiWD deleted the cpu-features branch June 15, 2021 05:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@NancyLi1013 NancyLi1013 NancyLi1013 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@NancyLi1013 NancyLi1013

Labels

category:port-bug The issue is with a library, which is something the port should already support 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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@WeiDaiWD @NancyLi1013 @strega-nil-ms