kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ninja: Fix OBJECT_DIR placeholder path conversion 

Transform the path using ConvertToNinjaPath just as we do for all other
paths.  This fixes the OutOfSource test for objects in the ../OutOfBinary
directory by computing the proper full path for the /Fd option.
This commit is contained in:
Brad King 2013-04-11 10:22:44 -04:00
parent fb9f73de64
commit 87c0d16ab7
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmNinjaTargetGenerator.cxx
View File

@ -569,11 +569,9 @@ cmNinjaTargetGenerator
EnsureParentDirectoryExists(objectFileName); EnsureParentDirectoryExists(objectFileName);
std::string objectDir = cmSystemTools::GetFilenamePath(objectFileName); std::string objectDir = cmSystemTools::GetFilenamePath(objectFileName);
objectDir = this->GetLocalGenerator()->Convert(objectDir.c_str(), vars["OBJECT_DIR"] = this->GetLocalGenerator()->ConvertToOutputFormat(
cmLocalGenerator::START_OUTPUT, ConvertToNinjaPath(objectDir.c_str()).c_str(),
cmLocalGenerator::SHELL); cmLocalGenerator::SHELL);
vars["OBJECT_DIR"] = objectDir;
this->SetMsvcTargetPdbVariable(vars); this->SetMsvcTargetPdbVariable(vars);