diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-13 13:36:06 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-03-13 13:36:06 (GMT) |
| commit | e1a671c7d821e3e240fc2eaf60b0572c8aed31e6 (patch) | |
| tree | 4c6a63752bc95aa3234c66ec19013346dd53c6ec /Source/cmTarget.cxx | |
| parent | 4a6a59a120eeb9a60e0da77eb701af80439a34db (diff) | |
| parent | d83245a34f870c373c6db8de94792608f133be58 (diff) | |
| download | CMake-e1a671c7d821e3e240fc2eaf60b0572c8aed31e6.zip CMake-e1a671c7d821e3e240fc2eaf60b0572c8aed31e6.tar.gz CMake-e1a671c7d821e3e240fc2eaf60b0572c8aed31e6.tar.bz2 | |
Merge topic 'fix-CMP0046-warning'
d83245a3 cmTarget: Don't create duplicate backtraces in CMP0046 warning
Diffstat (limited to 'Source/cmTarget.cxx')
| -rw-r--r-- | Source/cmTarget.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index c785192..ca34aea 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -418,11 +418,10 @@ void cmTarget::SetMakefile(cmMakefile* mf) //---------------------------------------------------------------------------- void cmTarget::AddUtility(const std::string& u, cmMakefile *makefile) { - this->Utilities.insert(u); - if(makefile) - { + if(this->Utilities.insert(u).second && makefile) + { makefile->GetBacktrace(UtilityBacktraces[u]); - } + } } //---------------------------------------------------------------------------- |