diff options
| author | Alexander Grund <Flamefire@users.noreply.github.com> | 2021-07-06 14:11:42 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-07-07 12:04:59 (GMT) |
| commit | c00f928ce1aba90c0b3fe8d6112eacd0f5494ec3 (patch) | |
| tree | bfa15043b2da6779de36d2d9ce73c51b850fc6a4 /Source/cmLocalGenerator.h | |
| parent | 5c02964aff0e126980fe327ad1601665d9fcabfe (diff) | |
| download | CMake-c00f928ce1aba90c0b3fe8d6112eacd0f5494ec3.zip CMake-c00f928ce1aba90c0b3fe8d6112eacd0f5494ec3.tar.gz CMake-c00f928ce1aba90c0b3fe8d6112eacd0f5494ec3.tar.bz2 | |
Do not exclude include directory symlinks to entries of CPATH
Extend the fix from commit 2d0b0e2b9d (Do not exclude include
directories made implicit by CPATH, 2019-05-29, v3.14.5~2^2) to cover
include directories that are symlinks to paths listed in `CPATH`.
Compare resolved paths against resolved entries of `CPATH`.
Resolve the entries as late as possible in case symlinks change.
Fixes: #22383
Diffstat (limited to 'Source/cmLocalGenerator.h')
| -rw-r--r-- | Source/cmLocalGenerator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index 993280a..cafb34d 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -587,7 +587,7 @@ protected: std::string::size_type ObjectPathMax; std::set<std::string> ObjectMaxPathViolations; - std::set<std::string> EnvCPATH; + std::vector<std::string> EnvCPATH; using GeneratorTargetMap = std::unordered_map<std::string, cmGeneratorTarget*>; |