diff options
author | Marc Chevrier <marc.chevrier@gmail.com> | 2023-09-20 10:59:53 (GMT) |
---|---|---|
committer | Marc Chevrier <marc.chevrier@gmail.com> | 2023-09-21 14:29:40 (GMT) |
commit | 3bdf95f942c8532fb1e0fbad52f04f46e822b2f9 (patch) | |
tree | 9808f750117dcf362e3daf94b29bf9c0924b72f4 /Source/cmLinkLineComputer.cxx | |
parent | 4ac624debc11e3b87d53a34ccfe3e25ff9c5a426 (diff) | |
download | CMake-3bdf95f942c8532fb1e0fbad52f04f46e822b2f9.zip CMake-3bdf95f942c8532fb1e0fbad52f04f46e822b2f9.tar.gz CMake-3bdf95f942c8532fb1e0fbad52f04f46e822b2f9.tar.bz2 |
macOS: GNU toolchain: ensure framework, marked as SYSTEM, can be linked
Fixes: #25263
Diffstat (limited to 'Source/cmLinkLineComputer.cxx')
-rw-r--r-- | Source/cmLinkLineComputer.cxx | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/Source/cmLinkLineComputer.cxx b/Source/cmLinkLineComputer.cxx index 1f5005b..a29e33f 100644 --- a/Source/cmLinkLineComputer.cxx +++ b/Source/cmLinkLineComputer.cxx @@ -192,24 +192,16 @@ std::string cmLinkLineComputer::ComputeRPath(cmComputeLinkInformation& cli) } std::string cmLinkLineComputer::ComputeFrameworkPath( - cmComputeLinkInformation& cli, cmValue fwSearchFlag, cmValue sysFwSearchFlag) + cmComputeLinkInformation& cli, cmValue fwSearchFlag) { - if (!fwSearchFlag && !sysFwSearchFlag) { + if (!fwSearchFlag) { return std::string{}; } std::string frameworkPath; - auto const& fwDirs = cli.GetFrameworkPaths(); - for (auto const& fd : fwDirs) { - if (sysFwSearchFlag && - cli.GetTarget()->IsSystemIncludeDirectory(fd, cli.GetConfig(), - cli.GetLinkLanguage())) { - frameworkPath += sysFwSearchFlag; - } else { - frameworkPath += fwSearchFlag; - } - frameworkPath += this->ConvertToOutputFormat(fd); - frameworkPath += " "; + for (auto const& fd : cli.GetFrameworkPaths()) { + frameworkPath += + cmStrCat(fwSearchFlag, this->ConvertToOutputFormat(fd), ' '); } return frameworkPath; } |