diff options
| author | Marc Chevrier <marc.chevrier@gmail.com> | 2023-08-28 15:10:19 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-08-28 15:10:31 (GMT) |
| commit | a52fc160a7df1bbefd6bf2df0333ea34e124e808 (patch) | |
| tree | a65d20c361dacf68793a3083668e5da49e8296be /Source | |
| parent | 889f9027379f31d25d33c1a21d5711e257409d49 (diff) | |
| parent | 878ae03832de33cdbad7990cc7a1177caaf2cead (diff) | |
| download | CMake-a52fc160a7df1bbefd6bf2df0333ea34e124e808.zip CMake-a52fc160a7df1bbefd6bf2df0333ea34e124e808.tar.gz CMake-a52fc160a7df1bbefd6bf2df0333ea34e124e808.tar.bz2 | |
Merge topic 'imported-framework-dir-is-system'
878ae03832 macOS: IMPORTED framework: Honor SYSTEM target property in all cases
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8758
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index db4be63..7799e1c 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -797,10 +797,10 @@ void handleSystemIncludesDep(cmLocalGenerator* lg, *dirs, lg, config, headTarget, dagChecker, depTgt, language)); } - if (depTgt->Target->IsFrameworkOnApple()) { + if (depTgt->Target->IsFrameworkOnApple() || + depTgt->IsImportedFrameworkFolderOnApple(config)) { if (auto fwDescriptor = depTgt->GetGlobalGenerator()->SplitFrameworkPath( - depTgt->GetLocation(config), - cmGlobalGenerator::FrameworkFormat::Strict)) { + depTgt->GetLocation(config))) { result.push_back(fwDescriptor->Directory); result.push_back(fwDescriptor->GetFrameworkPath()); } |