Skip to content
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

Jump to bottom

[vcpkg] Honor CMAKE_DISABLE_FIND_PACKAGE_*. Fixes #18631 #18961

Closed
wants to merge 4 commits into from
Closed

[vcpkg] Honor CMAKE_DISABLE_FIND_PACKAGE_*. Fixes #18631 #18961

wants to merge 4 commits into from

Conversation

ras0219-msft
Copy link
Contributor

Fixes #18631. See that issue for full details.

@dg0yt
Copy link
Contributor

dg0yt commented Jul 15, 2021

LGTM. But as usual with vcpkg.cmake, this is a no-op in CI. Perhaps you want to increment the port-version of some relevant port (zlib, tiff)? Or move it to some of the audit rollups or CI re-provisioning?

BillyONeal
BillyONeal previously approved these changes Jul 15, 2021
View reviewed changes
@JonLiu1993 JonLiu1993 added the category:vcpkg-bug The issue is with the vcpkg system (including helper scripts in `scripts/cmake/`) label Jul 16, 2021
@JackBoosY JackBoosY added the info:internal This PR or Issue was filed by the vcpkg team. label Jul 16, 2021
JackBoosY
JackBoosY previously approved these changes Jul 27, 2021
View reviewed changes
@ras0219-msft
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@dg0yt dg0yt mentioned this pull request Aug 9, 2021
Merged
dg0yt
dg0yt reviewed Sep 29, 2021
View reviewed changes
scripts/ports.cmake
# rebuild: 2
cmake_minimum_required(VERSION 3.20)
# rebuild: 1
cmake_minimum_required(VERSION 3.21)
Copy link
Contributor

Choose a reason for hiding this comment

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

There is still 3.20.4 for freebsd in

vcpkg/scripts/vcpkgTools.xml

Lines 31 to 37 in 33f02c0

<tool name="cmake" os="freebsd">
<version>3.20.4</version>
<exeRelativePath>usr/local/bin/cmake</exeRelativePath>
<url>https://pkg.freebsd.org/FreeBSD:13:amd64/quarterly/All/cmake-3.20.4.txz</url>
<sha512>3e5b675d7ff924f92996d912e2365582e687375109ef99c9073fb8196bb329243a406b218cf1358d7cc518988b311ce9e5bf87de4d64f2e6377b7c2bc8894475</sha512>
<archiveName>cmake-3.20.4.txz</archiveName>
</tool>

Copy link
Contributor

Choose a reason for hiding this comment

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

CMake 3.21.4 seems to be available for freebsd now:
https://www.freebsd.org/cgi/ports.cgi?query=cmake&stype=name&sektion=all

Copy link
Contributor

Choose a reason for hiding this comment

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

My comment is no longer relevant.
freebsd is still at 3.20.3 in vcpkg, but the requirement was bumped with another PR, and nobody (except for me) tool notice.

@dg0yt dg0yt mentioned this pull request Oct 30, 2021
Open
@dg0yt
Copy link
Contributor

dg0yt commented Feb 5, 2022

What is blocking this PR? I just stumbled over this again.

@BillyONeal
Copy link
Member

What is blocking this PR? I just stumbled over this again.

Robert (@ras0219) has a tendency to get dragged in to other things; he has not indicated recently that he is working on this. I imagine he would love to have this merged but he does not have the capacity right now to deal with the downstream fallout.

@ras0219-msft ras0219-msft marked this pull request as draft February 15, 2022 21:59
@ras0219-msft ras0219-msft dismissed stale reviews from JackBoosY and BillyONeal via 0f2d612 June 23, 2022 19:58
@JackBoosY JackBoosY assigned Cheney-W and unassigned JackBoosY Oct 10, 2022
@dg0yt dg0yt mentioned this pull request Dec 26, 2022
Open
@dg0yt
Copy link
Contributor

dg0yt commented Dec 26, 2022

If resolving the merge conflicts properly, it should also fix #28552.

@dan-shaw
Copy link
Contributor

Closing this PR, since the last update was over a year ago, please open a new PR if you are still working on this. Thanks!

@dan-shaw dan-shaw closed this Aug 24, 2023
@dg0yt
Copy link
Contributor

dg0yt commented Aug 24, 2023

Oh!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dg0yt dg0yt dg0yt left review comments

@github-actions github-actions[bot] github-actions[bot] approved these changes

@JackBoosY JackBoosY JackBoosY left review comments

@BillyONeal BillyONeal BillyONeal left review comments

Assignees

@Cheney-W Cheney-W

Labels
category:vcpkg-bug The issue is with the vcpkg system (including helper scripts in `scripts/cmake/`) info:internal This PR or Issue was filed by the vcpkg team.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

find_package in vcpkg.cmake must honor CMAKE_DISABLE_FIND_PACKAGE_<NAME>
7 participants
@ras0219-msft @dg0yt @BillyONeal @dan-shaw @JackBoosY @Cheney-W @JonLiu1993