diff options
| author | Brad King <brad.king@kitware.com> | 2012-10-01 18:05:11 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-10-01 18:05:11 (GMT) |
| commit | 7dce31f3d03e2202ad54d8b6eb8ab00bce8bbe00 (patch) | |
| tree | 88ded98011b9f5b12c3fce3a600d2d0da4ff8846 /Source/cmNinjaTargetGenerator.cxx | |
| parent | 7fc4d8138404f5855630377699a8632d7aa32dcf (diff) | |
| parent | 2ccca05fade0014dbfbce906b20ab4073ecd8d9c (diff) | |
| download | CMake-7dce31f3d03e2202ad54d8b6eb8ab00bce8bbe00.zip CMake-7dce31f3d03e2202ad54d8b6eb8ab00bce8bbe00.tar.gz CMake-7dce31f3d03e2202ad54d8b6eb8ab00bce8bbe00.tar.bz2 | |
Merge topic 'vs-pdb-output'
2ccca05 Run PDBDirectoryAndName test on MSVC and Intel
efc83b3 Document that PDB_(NAME|OUTPUT_DIRECTORY) are ignored for VS 6
b294457 Verify that PDB_(NAME|OUTPUT_DIRECTORY) are honored in test
3f60dbf Add PDB_OUTPUT_DIRECTORY and PDB_NAME target properties (#10830)
Diffstat (limited to 'Source/cmNinjaTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 8db06d3..612e047 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -329,10 +329,10 @@ bool cmNinjaTargetGenerator::SetMsvcTargetPdbVariable(cmNinjaVars& vars) const this->Target->GetType() == cmTarget::SHARED_LIBRARY || this->Target->GetType() == cmTarget::MODULE_LIBRARY) { - pdbPath = this->Target->GetDirectory(this->GetConfigName()); + pdbPath = this->Target->GetPDBDirectory(this->GetConfigName()); pdbPath += "/"; pdbPath += this->Target->GetPDBName(this->GetConfigName()); - } + } vars["TARGET_PDB"] = this->GetLocalGenerator()->ConvertToOutputFormat( ConvertToNinjaPath(pdbPath.c_str()).c_str(), |