[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4470-g71513d0

[Brad King]

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  71513d09e3bd5233c3480ab7dc2548535c2c1cd5 (commit)
       via  b9bf9190f0645d5906a6154dc37e10bb271d8d93 (commit)
       via  d4134352abf69374fdad24d53d67734a135daaa5 (commit)
       via  ffff99c58e00bcf068c59cadba0706eb5f342124 (commit)
       via  431eaf37830ceaa0c5b8eae2f95df97c37078c57 (commit)
       via  c33a38fe220309539fb3e71c1b0fade5a4965cc2 (commit)
       via  204a54774c5965ba74572b418db832510dfb0264 (commit)
       via  323f0b5acc9810e7cc304fe713468862ec2ebcb0 (commit)
       via  03c3fa68ea37af0dff590da724df8f548a9e34a9 (commit)
       via  ab9c7e36e598eb2fae3f3ee67c99c4afee7b8411 (commit)
       via  90b51230d93eef07e16000c6bdfe2eb0cef65a82 (commit)
       via  330db97e64e9e370ecf636aae2275044286537bf (commit)
      from  e20427d460f44c403c14bd81b801d1eb285fcded (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=71513d09e3bd5233c3480ab7dc2548535c2c1cd5
commit 71513d09e3bd5233c3480ab7dc2548535c2c1cd5
Merge: e20427d b9bf919
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 7 15:32:24 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 7 15:32:24 2013 -0400

    Merge branch 'INTERFACE_LIBRARY-target-type' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b9bf9190f0645d5906a6154dc37e10bb271d8d93
commit b9bf9190f0645d5906a6154dc37e10bb271d8d93
Merge: 60a6b16 d413435
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 7 15:30:29 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 7 15:30:29 2013 -0400

    Merge branch 'master' into INTERFACE_LIBRARY-target-type
    
    Resolve conflict in Source/cmExportInstallFileGenerator.cxx
    by updating the versions to match those from 'master'.

diff --cc Source/cmExportInstallFileGenerator.cxx
index af40159,c8b4a79..c71008e
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@@ -165,13 -160,9 +165,13 @@@ bool cmExportInstallFileGenerator::Gene
      this->GenerateInterfaceProperties(te, os, properties);
      }
  
 -  if (require2_8_12)
 +  if (require2_8_13)
 +    {
-     this->GenerateRequiredCMakeVersion(os, "2.8.11.20130815");
++    this->GenerateRequiredCMakeVersion(os, "2.8.12.20131007");
 +    }
 +  else if (require2_8_12)
      {
-     this->GenerateRequiredCMakeVersion(os, "2.8.11");
+     this->GenerateRequiredCMakeVersion(os, "2.8.12");
      }
  
    // Now load per-configuration properties for them.

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

Summary of changes:
 ChangeLog.manual                        |  575 +++++++++++++++++++++++++++++++
 Source/CMakeVersion.cmake               |    2 +-
 Source/cmExportInstallFileGenerator.cxx |    4 +-
 3 files changed, 578 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake