[Cmake-commits] CMake branch, next, updated. v2.8.11.2-2942-g65a82c1

[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  65a82c1210d6450845e340d3cce504a7d4d0e775 (commit)
       via  7b63dc270efa10da93c7cd3f8de581602d422236 (commit)
       via  79a4668f4b5860020eb2a1f99be149dd3944accc (commit)
      from  c1ba55f4222bc43fedf982c8a4dfa160cd47a26d (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=65a82c1210d6450845e340d3cce504a7d4d0e775
commit 65a82c1210d6450845e340d3cce504a7d4d0e775
Merge: c1ba55f 7b63dc2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jul 7 17:47:17 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jul 7 17:47:17 2013 -0400

    Merge topic 'bump-to-release-version' into next
    
    7b63dc2 Revert "Bump temporary version numbers to 2.8.12."
    79a4668 Bump temporary version numbers to 2.8.12.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b63dc270efa10da93c7cd3f8de581602d422236
commit 7b63dc270efa10da93c7cd3f8de581602d422236
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jul 7 23:46:48 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jul 7 23:46:48 2013 +0200

    Revert "Bump temporary version numbers to 2.8.12."
    
    This reverts commit 79a4668f4b5860020eb2a1f99be149dd3944accc.

diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 6b87cc6..560882e 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -158,7 +158,7 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
 
   if (require2_8_12)
     {
-    this->GenerateRequiredCMakeVersion(os, "2.8.12");
+    this->GenerateRequiredCMakeVersion(os, "2.8.11.20130626");
     }
 
   // Now load per-configuration properties for them.
diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx
index be039bf..75fcdb7 100644
--- a/Source/cmPolicies.cxx
+++ b/Source/cmPolicies.cxx
@@ -543,7 +543,7 @@ cmPolicies::cmPolicies()
     "the INCLUDE_DIRECTORIES target property.  "
     "The NEW behavior for this policy is to issue a FATAL_ERROR if "
     "INCLUDE_DIRECTORIES contains a relative path.",
-    2,8,12,0, cmPolicies::WARN);
+    2,8,11,20130516, cmPolicies::WARN);
 
   this->DefinePolicy(
     CMP0022, "CMP0022",
@@ -573,7 +573,7 @@ cmPolicies::cmPolicies()
     "The NEW behavior for this policy is to use the INTERFACE_LINK_LIBRARIES "
     "property for in-build targets, and ignore the old properties matching"
     "(IMPORTED_)?LINK_INTERFACE_LIBRARIES(_<CONFIG>)?.",
-    2,8,12,0, cmPolicies::WARN);
+    2,8,11,20130516, cmPolicies::WARN);
 }
 
 cmPolicies::~cmPolicies()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=79a4668f4b5860020eb2a1f99be149dd3944accc
commit 79a4668f4b5860020eb2a1f99be149dd3944accc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jun 28 11:50:21 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Jun 28 11:50:21 2013 +0200

    Bump temporary version numbers to 2.8.12.

diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 560882e..6b87cc6 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -158,7 +158,7 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
 
   if (require2_8_12)
     {
-    this->GenerateRequiredCMakeVersion(os, "2.8.11.20130626");
+    this->GenerateRequiredCMakeVersion(os, "2.8.12");
     }
 
   // Now load per-configuration properties for them.
diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx
index 75fcdb7..be039bf 100644
--- a/Source/cmPolicies.cxx
+++ b/Source/cmPolicies.cxx
@@ -543,7 +543,7 @@ cmPolicies::cmPolicies()
     "the INCLUDE_DIRECTORIES target property.  "
     "The NEW behavior for this policy is to issue a FATAL_ERROR if "
     "INCLUDE_DIRECTORIES contains a relative path.",
-    2,8,11,20130516, cmPolicies::WARN);
+    2,8,12,0, cmPolicies::WARN);
 
   this->DefinePolicy(
     CMP0022, "CMP0022",
@@ -573,7 +573,7 @@ cmPolicies::cmPolicies()
     "The NEW behavior for this policy is to use the INTERFACE_LINK_LIBRARIES "
     "property for in-build targets, and ignore the old properties matching"
     "(IMPORTED_)?LINK_INTERFACE_LIBRARIES(_<CONFIG>)?.",
-    2,8,11,20130516, cmPolicies::WARN);
+    2,8,12,0, cmPolicies::WARN);
 }
 
 cmPolicies::~cmPolicies()

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

Summary of changes:


hooks/post-receive
-- 
CMake