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 | |
| 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
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 6 | ||||
| -rw-r--r-- | Tests/RunCMake/Framework/FrameworkSystemIncludeTest.cmake | 12 |
2 files changed, 15 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()); } diff --git a/Tests/RunCMake/Framework/FrameworkSystemIncludeTest.cmake b/Tests/RunCMake/Framework/FrameworkSystemIncludeTest.cmake index bcf6c29..94c0b87 100644 --- a/Tests/RunCMake/Framework/FrameworkSystemIncludeTest.cmake +++ b/Tests/RunCMake/Framework/FrameworkSystemIncludeTest.cmake @@ -22,3 +22,15 @@ set_target_properties(Example::Example2 PROPERTIES add_library(testcase2 FrameworkSystemIncludeTest.c) target_compile_options(testcase2 PRIVATE "-Werror=#pragma-messages") target_link_libraries(testcase2 PRIVATE Example::Example2) + + + +add_library(Example::Example3 SHARED IMPORTED) +set_target_properties(Example::Example3 PROPERTIES + FRAMEWORK 1 + IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/subdir/Example.framework" +) + +add_library(testcase3 FrameworkSystemIncludeTest.c) +target_compile_options(testcase3 PRIVATE "-Werror=#pragma-messages") +target_link_libraries(testcase3 PRIVATE Example::Example3) |