This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, master has been updated via e1a671c7d821e3e240fc2eaf60b0572c8aed31e6 (commit) via d83245a34f870c373c6db8de94792608f133be58 (commit) from 4a6a59a120eeb9a60e0da77eb701af80439a34db (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e1a671c7d821e3e240fc2eaf60b0572c8aed31e6 commit e1a671c7d821e3e240fc2eaf60b0572c8aed31e6 Merge: 4a6a59a d83245a Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Mar 13 09:36:06 2014 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Mar 13 09:36:06 2014 -0400 Merge topic 'fix-CMP0046-warning' d83245a3 cmTarget: Don't create duplicate backtraces in CMP0046 warning diff --cc Source/cmTarget.cxx index c785192,3fb79d8..ca34aea --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@@ -416,13 -401,12 +416,12 @@@ void cmTarget::SetMakefile(cmMakefile* } //---------------------------------------------------------------------------- -void cmTarget::AddUtility(const char *u, cmMakefile *makefile) +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]); - } + } } //---------------------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: Source/cmTarget.cxx | 7 +++---- .../CMP0046-Duplicate-result.txt} | 0 ...ing-dependency-stderr.txt => CMP0046-Duplicate-stderr.txt} | 7 ++++--- Tests/RunCMake/CMP0046/CMP0046-Duplicate.cmake | 9 +++++++++ Tests/RunCMake/CMP0046/RunCMakeTest.cmake | 1 + Tests/RunCMake/{CMP0022 => CMP0046}/empty.cpp | 0 6 files changed, 17 insertions(+), 7 deletions(-) copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CMP0046/CMP0046-Duplicate-result.txt} (100%) copy Tests/RunCMake/CMP0046/{CMP0046-WARN-missing-dependency-stderr.txt => CMP0046-Duplicate-stderr.txt} (65%) create mode 100644 Tests/RunCMake/CMP0046/CMP0046-Duplicate.cmake copy Tests/RunCMake/{CMP0022 => CMP0046}/empty.cpp (100%) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits