[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3257-gf4e1a8b

[Alexander Neundorf]

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  f4e1a8b164d7f732037dff909d70602106a3b21a (commit)
       via  4b1919f73e7663799285171b472d76053fb99166 (commit)
      from  3f5d8ca1a663d1ad4142944a668080ff452a5788 (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=f4e1a8b164d7f732037dff909d70602106a3b21a
commit f4e1a8b164d7f732037dff909d70602106a3b21a
Merge: 3f5d8ca 4b1919f
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Fri Jul 19 16:57:17 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 19 16:57:17 2013 -0400

    Merge topic 'AddCommentsToExportsFile' into next
    
    4b1919f ExportTargets: add one more comment to the generated file.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b1919f73e7663799285171b472d76053fb99166
commit 4b1919f73e7663799285171b472d76053fb99166
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Fri Jul 19 22:57:33 2013 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Fri Jul 19 22:57:33 2013 +0200

    ExportTargets: add one more comment to the generated file.
    
    This patch adds a comment above the block which protects
    the exported targets file against multiple inclusion, to make
    the file easier to understand for readers.
    
    Alex

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index b4e6e81..90e6d51 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -792,7 +792,9 @@ void cmExportFileGenerator::GenerateImportVersionCode(std::ostream& os)
 void cmExportFileGenerator::GenerateExpectedTargetsCode(std::ostream& os,
                                             const std::string &expectedTargets)
 {
-  os << "set(_targetsDefined)\n"
+  os << "# Protect against multiple inclusion, which would fail when already "
+        "imported targets are added once more.\n"
+        "set(_targetsDefined)\n"
         "set(_targetsNotDefined)\n"
         "set(_expectedTargets)\n"
         "foreach(_expectedTarget " << expectedTargets << ")\n"

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

Summary of changes:
 Source/cmExportFileGenerator.cxx |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake