This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 2771c36f9476e0d7f948ad7f27665c675da77b44 (commit) via c72fc37db884ac5c3249e7560945efb23559dd9f (commit) from c62e13526d19b23d8dcdc1899d5147e58d8b7391 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2771c36f9476e0d7f948ad7f27665c675da77b44 commit 2771c36f9476e0d7f948ad7f27665c675da77b44 Merge: c62e135 c72fc37 Author: Bill Hoffman <bill.hoff...@kitware.com> AuthorDate: Tue Mar 13 17:03:13 2012 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue Mar 13 17:03:13 2012 -0400 Merge topic 'ninja-generator' into next c72fc37 Ninja generator fix for PDB files with spaces in the path. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c72fc37db884ac5c3249e7560945efb23559dd9f commit c72fc37db884ac5c3249e7560945efb23559dd9f Author: Bill Hoffman <bill.hoff...@kitware.com> AuthorDate: Tue Mar 13 17:01:25 2012 -0400 Commit: Bill Hoffman <bill.hoff...@kitware.com> CommitDate: Tue Mar 13 17:01:25 2012 -0400 Ninja generator 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. 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, ----------------------------------------------------------------------- Summary of changes: Source/cmNinjaNormalTargetGenerator.cxx | 3 ++- Source/cmNinjaTargetGenerator.cxx | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits