diff options
| author | Brad King <brad.king@kitware.com> | 2012-11-27 18:34:21 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-11-27 18:34:21 (GMT) |
| commit | 9e395feb466145617376eae4013755f684be3f80 (patch) | |
| tree | 3db9187b5ecee79eaebfc6b4684dfcfc47a83519 | |
| parent | f30393e28a49fe4d4e29d41cfc6b2a663ea691c0 (diff) | |
| parent | 12ab1354fcd9fb1ddc3611615ed3d6053afcd5f4 (diff) | |
| download | CMake-9e395feb466145617376eae4013755f684be3f80.zip CMake-9e395feb466145617376eae4013755f684be3f80.tar.gz CMake-9e395feb466145617376eae4013755f684be3f80.tar.bz2 | |
Merge topic 'ninja-encode-LINK_FLAGS'
12ab135 Ninja: encode LINK_FLAGS to handle bash variables
| -rw-r--r-- | Source/cmNinjaNormalTargetGenerator.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index 853bc12..65967a5 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -439,6 +439,9 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement() this->GetGeneratorTarget()); this->AddModuleDefinitionFlag(vars["LINK_FLAGS"]); + vars["LINK_FLAGS"] = cmGlobalNinjaGenerator + ::EncodeLiteral(vars["LINK_FLAGS"]); + vars["LINK_PATH"] = frameworkPath + linkPath; // Compute architecture specific link flags. Yes, these go into a different |