summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-09-13 15:37:53 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-09-13 15:37:53 (GMT)
commitb434b0510a37a947cf7291413134a1c0366b6358 (patch)
treef06667ac92b108a7d4a433fe510304134d1ba37d
parent1fef29e4c63ca5331670257f67505e06725a8c82 (diff)
parent271bf10263893e0ec2e0c9d20d2c0220262998ec (diff)
downloadCMake-b434b0510a37a947cf7291413134a1c0366b6358.zip
CMake-b434b0510a37a947cf7291413134a1c0366b6358.tar.gz
CMake-b434b0510a37a947cf7291413134a1c0366b6358.tar.bz2
Merge topic 'print-CMP0022-content-conflict'
271bf10 Fix CMP0022 warning when no old-style property is set
-rw-r--r--Source/cmTarget.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index ce0d0f2..ac655da 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -6449,7 +6449,7 @@ bool cmTarget::ComputeLinkInterface(const char* config, LinkInterface& iface,
<< newExplicitLibraries
<< "\n"
<< linkIfaceProp << ":\n "
- << explicitLibraries << "\n";
+ << (explicitLibraries ? explicitLibraries : "(empty)") << "\n";
this->Makefile->IssueMessage(cmake::AUTHOR_WARNING, w.str());
}
// Fall through