diff options
| author | Brad King <brad.king@kitware.com> | 2020-11-06 12:42:54 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-11-06 12:43:03 (GMT) |
| commit | a775a6a18b67e4b8656bebc2e39736ae94d50d39 (patch) | |
| tree | 38cf89766748290860865a7b930b976102202233 | |
| parent | 10b36244b65d531b6fd574ac6b12a371539c18dc (diff) | |
| parent | bffb17be3d1687f62c43028837a0e2331c997b43 (diff) | |
| download | CMake-a775a6a18b67e4b8656bebc2e39736ae94d50d39.zip CMake-a775a6a18b67e4b8656bebc2e39736ae94d50d39.tar.gz CMake-a775a6a18b67e4b8656bebc2e39736ae94d50d39.tar.bz2 | |
Merge topic 'xcode-inherit-paths' into release-3.19
bffb17be3d Xcode: Inherit target library and framework search paths from project
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5463
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index e7bbf72..908c182 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -3557,6 +3557,8 @@ void cmGlobalXCodeGenerator::AddDependAndLinkInformation(cmXCodeObject* target) for (auto& libDir : linkSearchPaths) { libSearchPaths.Add(this->XCodeEscapePath(libDir)); } + // Add paths defined in project-wide build settings + libSearchPaths.Add("$(inherited)"); this->AppendBuildSettingAttribute(target, "LIBRARY_SEARCH_PATHS", libSearchPaths.CreateList(), configName); @@ -3570,6 +3572,8 @@ void cmGlobalXCodeGenerator::AddDependAndLinkInformation(cmXCodeObject* target) for (auto& fwDir : frameworkSearchPaths) { fwSearchPaths.Add(this->XCodeEscapePath(fwDir)); } + // Add paths defined in project-wide build settings + fwSearchPaths.Add("$(inherited)"); this->AppendBuildSettingAttribute(target, "FRAMEWORK_SEARCH_PATHS", fwSearchPaths.CreateList(), configName); |