summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-02-27 09:11:22 -0500
committerCMake Topic Stage <kwrobot@kitware.com>2017-02-27 09:11:22 -0500
commite348d8db559fd1d79f936d42582eb628779d23ad (patch)
tree3397359292c52b77cebfeb3d68efe3fa5cceb546 /Source
parent9b02283a1fdb63b0cf9755ae37a0d22fc6f4dbf4 (diff)
parentfeff52d42ca18a52fd99e8fdfd3093c3a94eb498 (diff)
downloadcmake-e348d8db559fd1d79f936d42582eb628779d23ad.tar.gz
Merge topic 'object-library-compile-pdb'
feff52d4 Fix COMPILE_PDB_NAME when used on an OBJECT library
Diffstat (limited to 'Source')
-rw-r--r--Source/cmGeneratorTarget.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 8512b998d7..5815210ce2 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1147,7 +1147,7 @@ std::string cmGeneratorTarget::GetCompilePDBPath(
{
std::string dir = this->GetCompilePDBDirectory(config);
std::string name = this->GetCompilePDBName(config);
- if (dir.empty() && !name.empty()) {
+ if (dir.empty() && !name.empty() && this->HaveWellDefinedOutputFiles()) {
dir = this->GetPDBDirectory(config);
}
if (!dir.empty()) {