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 | b2552d50da2a9d91695645d466f861639fab0e04 (patch) | |
| tree | e921882be2815078e43b85003642ef1093066c4e /Source/cmGlobalXCodeGenerator.cxx | |
| parent | dd547c6a742d25f7c1a9059263f27737c8e53dc1 (diff) | |
| parent | bffb17be3d1687f62c43028837a0e2331c997b43 (diff) | |
| download | CMake-b2552d50da2a9d91695645d466f861639fab0e04.zip CMake-b2552d50da2a9d91695645d466f861639fab0e04.tar.gz CMake-b2552d50da2a9d91695645d466f861639fab0e04.tar.bz2 | |
Merge topic 'xcode-inherit-paths'
bffb17be3d Xcode: Inherit target library and framework search paths from project
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5463
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
| -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 dd4a4a8..91f8c2b 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -3556,6 +3556,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); @@ -3569,6 +3571,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); |