diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2012-03-13 21:01:25 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-03-16 14:16:45 (GMT) |
| commit | bba37dd51753165ce3ade61badb61c07e1058e90 (patch) | |
| tree | d9a96f5c2a880afed50718f72d950f8edbf06e70 | |
| parent | ac800f49d07337df79565c77fe0847222ade520b (diff) | |
| download | CMake-bba37dd51753165ce3ade61badb61c07e1058e90.zip CMake-bba37dd51753165ce3ade61badb61c07e1058e90.tar.gz CMake-bba37dd51753165ce3ade61badb61c07e1058e90.tar.bz2 | |
Ninja: Fix for PDB files with spaces in the path.
This calls ConvertToOutputFormat on the PDB paths for pdb file paths
used in both library creation and the building of object files.
| -rw-r--r-- | Source/cmNinjaNormalTargetGenerator.cxx | 3 | ||||
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index af7bcd6..439f734 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -372,7 +372,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement() targetOutputImplib.c_str(), cmLocalGenerator::SHELL); } - vars["TARGET_PDB"] = this->GetTargetPDB(); + vars["TARGET_PDB"] = this->GetLocalGenerator()->ConvertToOutputFormat( + this->GetTargetPDB().c_str(), cmLocalGenerator::SHELL); std::vector<cmCustomCommand> *cmdLists[3] = { &this->GetTarget()->GetPreBuildCommands(), diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 8fa367f..b9f997d 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -464,7 +464,8 @@ cmNinjaTargetGenerator cmNinjaVars vars; vars["FLAGS"] = this->ComputeFlagsForObject(source, language); vars["DEFINES"] = this->ComputeDefines(source, language); - vars["TARGET_PDB"] = this->GetTargetPDB(); + vars["TARGET_PDB"] = this->GetLocalGenerator()->ConvertToOutputFormat( + this->GetTargetPDB().c_str(), cmLocalGenerator::SHELL); cmGlobalNinjaGenerator::WriteBuild(this->GetBuildFileStream(), comment, |