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:
parent
fb9f73de64
commit
87c0d16ab7
|
@ -569,11 +569,9 @@ cmNinjaTargetGenerator
|
|||
EnsureParentDirectoryExists(objectFileName);
|
||||
|
||||
std::string objectDir = cmSystemTools::GetFilenamePath(objectFileName);
|
||||
objectDir = this->GetLocalGenerator()->Convert(objectDir.c_str(),
|
||||
cmLocalGenerator::START_OUTPUT,
|
||||
cmLocalGenerator::SHELL);
|
||||
vars["OBJECT_DIR"] = objectDir;
|
||||
|
||||
vars["OBJECT_DIR"] = this->GetLocalGenerator()->ConvertToOutputFormat(
|
||||
ConvertToNinjaPath(objectDir.c_str()).c_str(),
|
||||
cmLocalGenerator::SHELL);
|
||||
|
||||
this->SetMsvcTargetPdbVariable(vars);
|
||||
|
||||
|
|
Loading…
Reference in New Issue