[pull] master from Kitware:master#2491
Merged
pull[bot] merged 19 commits intoMu-L:masterfrom May 27, 2025
Merged
Conversation
The install tests check that the output matches content including the "status" portion of the output. Unset the variable to avoid leakage from development environments.
The components checked for `.empty()` are never actually empty.
Some code paths end up recomputing some paths that are computed in member variables. Use them.
Lots of code simplification.
With all code starting to go towards using per-target directories, Xcode needs to use one as well.
This will allow object locations to be changed in a single place.
Refactoring in commit c4e8909 (try_compile: consistently add language properties, 2020-06-15, v3.19.0-rc1~633^2) accidentally dropped the `_LINK` part of the name. It also miscounted array indexes in a way that happened to propagate `CMAKE_<LANG>_LINK_NO_PIE_SUPPORTED` whether or not it is needed for the CMP0083 NEW behavior. Simplify the code and fix the variable name. Fixes: #26948
In a coming change to shorten directory paths, this allows one place to decide how to compute the target path root.
…put root When target directories are shortened, the `CMakeFiles` path component will be part of the root, not the target directory. Since other files end up constructing paths manually, move the differing component into the correct logical path construction part.
Visual Studio doesn't use a `CMakeFiles` subdirectory for its support directories. However, some codepaths expect to use paths which are always under `CMakeFiles`. Add a mechanism to keep the path for such files.
b0eb74c try_compile: Restore propagation of CMAKE_<LANG>_LINK_PIE_SUPPORTED Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !10818
c95a834 cmLocalGenerator: add an override for CMakeFiles-using paths 35d32b8 cmLocalGenerator: move the `CMakeFiles` subdir from the target to output root bc19e42 generators: use `GetObjectOutputRoot` to compute target directories b1d9a53 cmLocalGenerator: add a `GetObjectOutputRoot` method b82a74d generators: use GetSupportDirectory() in more places 36f85ee cmGeneratorTarget: query the local generator for the target directory ff5d7bc cmLocalXCodeGenerator: use a per-target directory aafd771 cmNinjaTargetGenerator: use `GetObjectFileDir` where possible ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !10812
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.1)
Can you help keep this open source service alive? 💖 Please sponsor : )