summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefileExecutableTargetGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2012-10-01 18:05:11 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2012-10-01 18:05:11 (GMT)
commit7dce31f3d03e2202ad54d8b6eb8ab00bce8bbe00 (patch)
tree88ded98011b9f5b12c3fce3a600d2d0da4ff8846 /Source/cmMakefileExecutableTargetGenerator.cxx
parent7fc4d8138404f5855630377699a8632d7aa32dcf (diff)
parent2ccca05fade0014dbfbce906b20ab4073ecd8d9c (diff)
downloadCMake-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/cmMakefileExecutableTargetGenerator.cxx')
-rw-r--r--Source/cmMakefileExecutableTargetGenerator.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index ca5f26a..761cb26 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -131,9 +131,14 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
outpathImp += "/";
}
}
+
+ std::string pdbOutputPath = this->Target->GetPDBDirectory();
+ cmSystemTools::MakeDirectory(pdbOutputPath.c_str());
+ pdbOutputPath += "/";
+
std::string targetFullPath = outpath + targetName;
std::string targetFullPathReal = outpath + targetNameReal;
- std::string targetFullPathPDB = outpath + targetNamePDB;
+ std::string targetFullPathPDB = pdbOutputPath + targetNamePDB;
std::string targetFullPathImport = outpathImp + targetNameImport;
std::string targetOutPathPDB =
this->Convert(targetFullPathPDB.c_str(),