[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7615-g6201a5f

[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  6201a5f4b166b600ff0e31b2437107ac28d89735 (commit)
       via  1eb317b8cbcfdbb0afab3247a8d86d8f647df364 (commit)
      from  0fc09f7974f8a61cd2906650b1732e58acc6daa4 (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=6201a5f4b166b600ff0e31b2437107ac28d89735
commit 6201a5f4b166b600ff0e31b2437107ac28d89735
Merge: 0fc09f7 1eb317b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 11 11:05:30 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 11 11:05:30 2014 -0500

    Merge topic 'cmake-devel-version-macro' into next
    
    1eb317b8 Revert "Export: Issue runtime error if DEVEL_CMAKE_VERSION requests old version."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1eb317b8cbcfdbb0afab3247a8d86d8f647df364
commit 1eb317b8cbcfdbb0afab3247a8d86d8f647df364
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 11 17:05:05 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 11 17:05:05 2014 +0100

    Revert "Export: Issue runtime error if DEVEL_CMAKE_VERSION requests old version."
    
    This reverts commit 2197bcdeeaecd158778318d30f1d8bbb2db2b34f.

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index c42e6d1..4a161ee 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -179,7 +179,6 @@ void cmExportFileGenerator::PopulateInterfaceProperty(const char *propName,
 void cmExportFileGenerator::GenerateRequiredCMakeVersion(std::ostream& os,
                                                     const char *versionString)
 {
-  assert(versionString);
   os << "if(CMAKE_VERSION VERSION_LESS " << versionString << ")\n"
         "  message(FATAL_ERROR \"This file relies on consumers using "
         "CMake " << versionString << " or greater.\")\n"
diff --git a/Source/cmExportFileGenerator.h b/Source/cmExportFileGenerator.h
index a0dd540..8be4bbf 100644
--- a/Source/cmExportFileGenerator.h
+++ b/Source/cmExportFileGenerator.h
@@ -22,10 +22,6 @@
 #define STRINGIFY(X) STRINGIFY_HELPER(X)
 
 #define DEVEL_CMAKE_VERSION(maj, min, patch) \
-  (CMake_VERSION_ENCODE(maj, min, patch) < \
-   CMake_VERSION_ENCODE(CMake_VERSION_MAJOR, CMake_VERSION_MINOR, \
-                        CMake_VERSION_PATCH) \
-  ) ? 0 : \
   (CMake_VERSION_ENCODE(maj, min, patch) > \
    CMake_VERSION_ENCODE(CMake_VERSION_MAJOR, CMake_VERSION_MINOR, \
                         CMake_VERSION_PATCH) \

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

Summary of changes:
 Source/cmExportFileGenerator.cxx |    1 -
 Source/cmExportFileGenerator.h   |    4 ----
 2 files changed, 5 deletions(-)


hooks/post-receive
-- 
CMake