[vcpkg.cmake] fix Neumann-A problem with find_package #17955
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
strega-nil-ms
added
category:code-cleanup
Neumann-A
reviewed
May 15, 2021
Comment on lines
+690
to
+695
| function("${VCPKG_OVERRIDE_FIND_PACKAGE_NAME}" z_vcpkg_fp_package_name) | ||
| # these variables, as well as any variables matching `z_vcpkg_fp_*`, | ||
| # are not reexported to parent scope | ||
| set(z_vcpkg_fp_ignored_variables | ||
| "^(ARGS|z_vcpkg_fp_.*|CMAKE_FIND_ROOT_PATH|Boost_USE_STATIC_LIBS|Boost_USE_MULTITHREADED|Boost_USE_STATIC_RUNTIME|Boost_NO_BOOST_CMAKE|Boost_COMPILER)$") | ||
|
|
There was a problem hiding this comment.
I think this should be a macro instead. You can backup the ignored variables and restore them afterwards if necessary or unset them. In the end you are forwarding all the variables any way so why not make it a macro?
Neumann-A
reviewed
May 15, 2021
| else() | ||
| list(FILTER z_vcpkg_fp_variable_list EXCLUDE "${z_vcpkg_fp_ignored_variables}") | ||
| foreach(z_vcpkg_fp_variable IN LISTS z_vcpkg_fp_variable_list) | ||
| set("${z_vcpkg_fp_variable}" "${${z_vcpkg_fp_variable}}" PARENT_SCOPE) |
There was a problem hiding this comment.
The problem whatever ${${z_vcpkg_fp_variable}} is determines the final size of the log. If it is a very big string it will be set numerous times if it is a nested find_package call. If it would be a macro this would not happen since you don't need to forward!
|
Just for metrics:
|
|
Just to give an example: and there are like screens over screens of those settings in the log. |
8 tasks
|
@strega-nil, we saw the opencv4 failure starts from this changes, related PR #17983 Could you please take a look? |
|
hmm CI seems to not have rebuild the world. Took only 3 mins. |
strega-nil
added a commit
to strega-nil/vcpkg
that referenced
this pull request
May 18, 2021
…oft#17955)" This reverts commit b369b11. This change broke opencv, and it was not noticed since vcpkg.cmake didn't rebuild the world.
strega-nil-ms
pushed a commit
that referenced
this pull request
May 18, 2021
|
vcpkg.cmake is not considered in binary cache hashing. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Basically, traces with vcpkg.cmake are way too long; this halves or quarters the size of traces (and additionally makes some minor improvements like "working automatically on arm64-osx")