[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7578-gd6c6979

[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  d6c69792dd0f86f99162f7c2085a5d34c7fddb0d (commit)
       via  c0da99666ba4282da74e441efea66188b2de13bd (commit)
      from  8be986b6210241610c8ae8e89f7ef8793226b0ef (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=d6c69792dd0f86f99162f7c2085a5d34c7fddb0d
commit d6c69792dd0f86f99162f7c2085a5d34c7fddb0d
Merge: 8be986b c0da996
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 10 11:57:01 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 10 11:57:01 2014 -0500

    Merge topic 'cmake-devel-version-macro' into next
    
    c0da9966 Export: Fix internal CMake version test logic


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c0da99666ba4282da74e441efea66188b2de13bd
commit c0da99666ba4282da74e441efea66188b2de13bd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 10 11:50:54 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 10 11:53:48 2014 -0500

    Export: Fix internal CMake version test logic
    
    Fix the internal DEVEL_CMAKE_VERSION macro to perform an ordered
    component-wise version test.  Otherwise an old invocation of the macro
    may be tricked into using the current version when the requested major
    version is smaller than the current version but the requested minor
    version is larger.  It should use the requested (old) version in that
    case.

diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index eb7cea9..73e7cee 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -26,8 +26,10 @@
 
 #define DEVEL_CMAKE_VERSION(maj, min, patch) \
   (maj > CMake_VERSION_MAJOR \
-  || min > CMake_VERSION_MINOR \
-  || patch > CMake_VERSION_PATCH) ? \
+   || (maj == CMake_VERSION_MAJOR && min > CMake_VERSION_MINOR) \
+   || (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

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

Summary of changes:
 Source/cmExportInstallFileGenerator.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake