Skip to content

[scripts-audit] vcpkg.cmake#16061

Merged
strega-nil merged 11 commits intomicrosoft:masterfrom
strega-nil:x_z_variables
Feb 19, 2021
Merged

[scripts-audit] vcpkg.cmake#16061
strega-nil merged 11 commits intomicrosoft:masterfrom
strega-nil:x_z_variables

Conversation

@strega-nil
Copy link
Copy Markdown
Contributor

@strega-nil strega-nil commented Feb 5, 2021

See PR #16055

This also (attempts to) allow vcpkg.cmake to run with cmake 3.1; we had a VERSION_GREATER_EQUAL check, but that if keyword was added in cmake 3.7.

@strega-nil strega-nil force-pushed the x_z_variables branch 2 times, most recently from 20f4464 to 0a6efac Compare February 5, 2021 22:50
@Neumann-A
Copy link
Copy Markdown
Contributor

I would really like to see some cleanup first instead of more things added to vcpkg.cmake.

@PhoebeHui PhoebeHui self-assigned this Feb 7, 2021
@PhoebeHui PhoebeHui added info:internal category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed labels Feb 7, 2021
Copy link
Copy Markdown
Contributor

@ras0219-msft ras0219-msft left a comment

Choose a reason for hiding this comment

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

The pieces I've reviewed LGTM so far.

Still to review:

  • New macro/functions
  • find_package() override

@strega-nil strega-nil added the depends:different-pr This PR or Issue depends on a PR which has been filed label Feb 8, 2021
@strega-nil strega-nil marked this pull request as draft February 8, 2021 23:39
@strega-nil
Copy link
Copy Markdown
Contributor Author

strega-nil commented Feb 8, 2021

Depends on #16130 merged

See PR microsoft#16055

This also (attempts to) allow vcpkg.cmake to run with cmake 3.0; we had
a VERSION_GREATER_EQUAL check, but that if keyword was added in cmake
3.7.
instead of a custom macro
also, as a drive-by, switch to foreach(X IN LISTS ...)
additionally, move the options and settings to the top of the file
@strega-nil strega-nil removed the depends:different-pr This PR or Issue depends on a PR which has been filed label Feb 10, 2021
@strega-nil strega-nil marked this pull request as ready for review February 10, 2021 00:02
* remove z_vcpkg_utilities due to export
* add cmake_policy(PUSH|POP)
* add VCPKG_INSTALLED_DIR input variable
* add .cmakestamp to vcpkg_installed
also, remove spaces between if and (, to keep style consistent
(mostly for ease of grepping...)
@strega-nil
Copy link
Copy Markdown
Contributor Author

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@strega-nil strega-nil changed the title [vcpkg.cmake] modify to get in line with audit [scripts-audit] vcpkg.cmake Feb 12, 2021
@strega-nil
Copy link
Copy Markdown
Contributor Author

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@strega-nil strega-nil merged commit 1bb5ea1 into microsoft:master Feb 19, 2021
Jimmy-Hu added a commit to Jimmy-Hu/vcpkg that referenced this pull request Feb 19, 2021
@cenit
Copy link
Copy Markdown
Contributor

cenit commented Feb 19, 2021

@strega-nil Did you try the vcpkg.cmake script after the re-work (audit?) on a downstream project?
It looks like it broke vcpkg totally. No packages can be found. I can reproduce it locally and it is being triggered right now in every ci pipeline of mine.
A message is also just appeared about that: #15956 (comment)

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

Labels

category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants