diff options
| author | David Cole <david.cole@kitware.com> | 2011-11-08 19:43:18 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-11-08 19:43:18 (GMT) |
| commit | a985a9e0f783cf2e8c84491145a52e482ef03ae0 (patch) | |
| tree | 78d127dc34cd33e75d4e3628f4db2bc94d88ce0e /Source | |
| parent | e4085569a95c223ff27680d48b9019196fb25db3 (diff) | |
| parent | e74f3744ae25b5be2bf6e4c33a0420d836a2f37d (diff) | |
| download | CMake-a985a9e0f783cf2e8c84491145a52e482ef03ae0.zip CMake-a985a9e0f783cf2e8c84491145a52e482ef03ae0.tar.gz CMake-a985a9e0f783cf2e8c84491145a52e482ef03ae0.tar.bz2 | |
Merge topic 'framework-with-space'
e74f374 Fix linking to OS X Frameworks named with spaces (#12550)
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmComputeLinkInformation.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index c87b64d..f8ab686 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -1318,8 +1318,9 @@ void cmComputeLinkInformation::AddFrameworkItem(std::string const& item) this->AddFrameworkPath(this->SplitFramework.match(1)); // Add the item using the -framework option. - std::string fw = "-framework "; - fw += this->SplitFramework.match(2); + this->Items.push_back(Item("-framework", false)); + std::string fw = this->SplitFramework.match(2); + fw = this->LocalGenerator->EscapeForShell(fw.c_str()); this->Items.push_back(Item(fw, false)); } |