[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-910-g6e257cf

[Stephen Kelly]

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, next has been updated
       via  6e257cf1538b9845e43b75a782dfcbe40c1aed6e (commit)
       via  d83245a34f870c373c6db8de94792608f133be58 (commit)
      from  50204817f8062b17f4d913491dcdd7686d005aa2 (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=6e257cf1538b9845e43b75a782dfcbe40c1aed6e
commit 6e257cf1538b9845e43b75a782dfcbe40c1aed6e
Merge: 5020481 d83245a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 12 13:02:08 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 12 13:02:08 2014 -0400

    Merge topic 'fix-CMP0046-warning' into next
    
    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]);
-   }
+     }
  }
  
  //----------------------------------------------------------------------------

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d83245a34f870c373c6db8de94792608f133be58
commit d83245a34f870c373c6db8de94792608f133be58
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 12 17:59:36 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Mar 12 18:01:26 2014 +0100

    cmTarget: Don't create duplicate backtraces in CMP0046 warning

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 84a9a7c..3fb79d8 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -403,11 +403,10 @@ void cmTarget::SetMakefile(cmMakefile* mf)
 //----------------------------------------------------------------------------
 void cmTarget::AddUtility(const char *u, cmMakefile *makefile)
 {
-  this->Utilities.insert(u);
-  if(makefile)
-  {
+  if(this->Utilities.insert(u).second && makefile)
+    {
     makefile->GetBacktrace(UtilityBacktraces[u]);
-  }
+    }
 }
 
 //----------------------------------------------------------------------------
diff --git a/Tests/RunCMake/CMP0046/CMP0046-Duplicate-result.txt b/Tests/RunCMake/CMP0046/CMP0046-Duplicate-result.txt
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/Tests/RunCMake/CMP0046/CMP0046-Duplicate-result.txt
@@ -0,0 +1 @@
+0
diff --git a/Tests/RunCMake/CMP0046/CMP0046-Duplicate-stderr.txt b/Tests/RunCMake/CMP0046/CMP0046-Duplicate-stderr.txt
new file mode 100644
index 0000000..fb31d6d
--- /dev/null
+++ b/Tests/RunCMake/CMP0046/CMP0046-Duplicate-stderr.txt
@@ -0,0 +1,10 @@
+CMake Warning \(dev\) at CMP0046-Duplicate.cmake:5 \(add_dependencies\):
+  Policy CMP0046 is not set: Error on non-existent dependency in
+  add_dependencies.  Run "cmake --help-policy CMP0046" for policy details.
+  Use the cmake_policy command to set the policy and suppress this warning.
+
+  The dependency target "ctgt_no_exist" of target "dummy" does not exist.
+Call Stack \(most recent call first\):
+  CMP0046-Duplicate.cmake:8 \(add_dep\)
+  CMakeLists.txt:3 \(include\)
+This warning is for project developers.  Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/CMP0046/CMP0046-Duplicate.cmake b/Tests/RunCMake/CMP0046/CMP0046-Duplicate.cmake
new file mode 100644
index 0000000..26e640b
--- /dev/null
+++ b/Tests/RunCMake/CMP0046/CMP0046-Duplicate.cmake
@@ -0,0 +1,9 @@
+
+add_library(dummy empty.cpp)
+
+macro(add_dep)
+  add_dependencies(dummy ctgt_no_exist)
+endmacro()
+
+add_dep()
+add_dep()
diff --git a/Tests/RunCMake/CMP0046/RunCMakeTest.cmake b/Tests/RunCMake/CMP0046/RunCMakeTest.cmake
index 5131e5b..0a39c76 100644
--- a/Tests/RunCMake/CMP0046/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CMP0046/RunCMakeTest.cmake
@@ -6,3 +6,4 @@ run_cmake(CMP0046-WARN-missing-dependency)
 
 run_cmake(CMP0046-OLD-existing-dependency)
 run_cmake(CMP0046-NEW-existing-dependency)
+run_cmake(CMP0046-Duplicate)
diff --git a/Tests/RunCMake/CMP0046/empty.cpp b/Tests/RunCMake/CMP0046/empty.cpp
new file mode 100644
index 0000000..bfbbdde
--- /dev/null
+++ b/Tests/RunCMake/CMP0046/empty.cpp
@@ -0,0 +1,7 @@
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+int empty()
+{
+  return 0;
+}

-----------------------------------------------------------------------

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