[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7554-gd2aa6a4

[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  d2aa6a42b212e0d71b69db05e045472ad57e8249 (commit)
       via  eaf703f16082fdd79983e32356aa20e64f94bd8b (commit)
      from  12cac26033e50e429252ee4ce0987dbda570ffd4 (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=d2aa6a42b212e0d71b69db05e045472ad57e8249
commit d2aa6a42b212e0d71b69db05e045472ad57e8249
Merge: 12cac26 eaf703f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 9 16:32:37 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 9 16:32:37 2014 -0500

    Merge topic 'cmake-devel-version-macro' into next
    
    eaf703f1 Export: Use a macro to ensure minimum development version requirement


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eaf703f16082fdd79983e32356aa20e64f94bd8b
commit eaf703f16082fdd79983e32356aa20e64f94bd8b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 9 22:30:30 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Feb 9 22:30:30 2014 +0100

    Export: Use a macro to ensure minimum development version requirement
    
    Use the version number of the specified release, or of the current
    development version if the release is not yet made.

diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 73e9b31..eb7cea9 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -19,6 +19,18 @@
 #include "cmInstallExportGenerator.h"
 #include "cmInstallTargetGenerator.h"
 #include "cmTargetExport.h"
+#include "cmVersionConfig.h"
+
+#define STRINGIFY_HELPER(X) #X
+#define STRINGIFY(X) STRINGIFY_HELPER(X)
+
+#define DEVEL_CMAKE_VERSION(maj, min, patch) \
+  (maj > CMake_VERSION_MAJOR \
+  || min > CMake_VERSION_MINOR \
+  || patch > CMake_VERSION_PATCH) ? \
+    STRINGIFY(CMake_VERSION_MAJOR) "." STRINGIFY(CMake_VERSION_MINOR) "." \
+    STRINGIFY(CMake_VERSION_PATCH) "." STRINGIFY(CMake_VERSION_TWEAK) \
+  : #maj "." #min "." #patch
 
 //----------------------------------------------------------------------------
 cmExportInstallFileGenerator
@@ -176,7 +188,7 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
 
   if (require3_0_0)
     {
-    this->GenerateRequiredCMakeVersion(os, "2.8.12.20131007");
+    this->GenerateRequiredCMakeVersion(os, DEVEL_CMAKE_VERSION(3, 0, 0));
     }
   else if (require2_8_12)
     {

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

Summary of changes:
 Source/cmExportInstallFileGenerator.cxx |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake