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.

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

[scripts-audit] z_vcpkg_get_cmake_vars #18839

Conversation

strega-nil
Copy link
Contributor

Rename vcpkg_internal_get_cmake_vars -> z_vcpkg_get_cmake_vars, and do an audit. Also add a cache variable so we don't rerun, and remove the OPTIONS variable since it probably shouldn't be used.

@strega-nil
Copy link
Contributor Author

From @dg0yt:

remove the OPTIONS variable since it probably shouldn't be used.

OPTIONS allowed to query additional variable without changing this script. A pending use is in PR #16706.
However, I would agree that this must eventually be achieved in another way - OPTIONS requires knowledge of implementation details.

@strega-nil
Copy link
Contributor Author

From @dg0yt:

I wish there was a way to silence the output of this function. It causes an extra "Configuring " which is quite confusing.

@strega-nil
Copy link
Contributor Author

remove the OPTIONS variable since it probably shouldn't be used.

OPTIONS allowed to query additional variable without changing this script. A pending use is in PR #16706.
However, I would agree that this must eventually be achieved in another way - OPTIONS requires knowledge of implementation details.

I'd say the way to do this is to add the variables to get_cmake_vars, as opposed to adding extra options

I wish there was a way to silence the output of this function. It causes an extra "Configuring " which is quite confusing.

this is a good point.

@strega-nil strega-nil marked this pull request as draft July 6, 2021 17:14
@PhoebeHui PhoebeHui added category:scripts-audit Part of the scripts audit effort. info:world-rebuild labels Jul 7, 2021
@strega-nil strega-nil marked this pull request as ready for review July 13, 2021 16:54
@strega-nil-ms strega-nil-ms marked this pull request as draft July 14, 2021 19:58
@strega-nil-ms strega-nil-ms force-pushed the scripts-audit/z_vcpkg_get_cmake_vars branch 3 times, most recently from 9820af8 to 1857759 Compare July 23, 2021 19:54
@strega-nil-ms strega-nil-ms marked this pull request as ready for review July 23, 2021 20:16
@strega-nil-ms
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 4990d2b9510876531eb7e73eeba09210178e804f -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
index 85acde8..ed13062 100644
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "87ed46717cf5268cc6f4502bafabc28a01bce39c",
+      "git-tree": "337b3b6207cf0bf424472af73439176f835497e1",
       "version": "4.4",
       "port-version": 11
     },

@strega-nil-ms strega-nil-ms force-pushed the scripts-audit/z_vcpkg_get_cmake_vars branch from 7212597 to 54573b5 Compare July 27, 2021 16:53
@strega-nil-ms strega-nil-ms force-pushed the scripts-audit/z_vcpkg_get_cmake_vars branch from 1496b1b to ce9f179 Compare July 27, 2021 23:39
@strega-nil-ms strega-nil-ms force-pushed the scripts-audit/z_vcpkg_get_cmake_vars branch from ce9f179 to 0045609 Compare July 27, 2021 23:43
@strega-nil-ms
Copy link
Contributor

Closed for rollup

strega-nil-ms pushed a commit to strega-nil/vcpkg that referenced this pull request Jul 28, 2021
[scripts-audit] z_vcpkg_get_cmake_vars
strega-nil-ms added a commit that referenced this pull request Jul 29, 2021
* [rollup:2021-07-26 1/6] PR #18783 (@strega-nil)

[scripts-audit] vcpkg_copy_tools and friends

* [rollup:2021-07-26 2/6] PR #18898 (@dg0yt)

[vcpkg] Fix toolchain compatibility with cmake < 3.15

* [rollup:2021-07-26 3/6] PR #18980 (@strega-nil)

[cmake-guidelines] Minor update, for `if()`

* [rollup:2021-07-26 4/6] PR #18981 (@strega-nil)

[scripts-audit] vcpkg_check_linkage

* [rollup:2021-07-26 5/6] PR #19158 (@Hoikas)

[vcpkg.cmake] Fix variable case.

* [rollup:2021-07-26 6/6] PR #18839

[scripts-audit] z_vcpkg_get_cmake_vars

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:scripts-audit Part of the scripts audit effort.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants