[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-988-g81bd110

[Rolf Eike Beer]

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  81bd110de4e4e6a503ff348bb16af1700ea9c12c (commit)
       via  4c8c3ba912fcca9d9154365d0757ce14b3be0670 (commit)
      from  d39df852faa5424913e350b13a53232aafbce1fb (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=81bd110de4e4e6a503ff348bb16af1700ea9c12c
commit 81bd110de4e4e6a503ff348bb16af1700ea9c12c
Merge: d39df85 4c8c3ba
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Dec 2 09:39:08 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 2 09:39:08 2014 -0500

    Merge topic 'FindPythonInterp-Fix-1.4' into next
    
    4c8c3ba9 FindPythonInterp: fix version component variables for Python 1.4 (#15275)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c8c3ba912fcca9d9154365d0757ce14b3be0670
commit 4c8c3ba912fcca9d9154365d0757ce14b3be0670
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Dec 2 15:36:59 2014 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Dec 2 15:36:59 2014 +0100

    FindPythonInterp: fix version component variables for Python 1.4 (#15275)
    
    This bug was introduced in "FindPythonInterp: rework the version detection"
    7d6db93de9ffc6e6092fa722aaf9c057dadcd634.

diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
index 5e5c7b9..8784e18 100644
--- a/Modules/FindPythonInterp.cmake
+++ b/Modules/FindPythonInterp.cmake
@@ -148,8 +148,8 @@ if(PYTHON_EXECUTABLE)
             # this is older.
             set(PYTHON_VERSION_STRING "1.4")
             set(PYTHON_VERSION_MAJOR "1")
-            set(PYTHON_VERSION_MAJOR "4")
-            set(PYTHON_VERSION_MAJOR "0")
+            set(PYTHON_VERSION_MINOR "4")
+            set(PYTHON_VERSION_PATCH "0")
         endif()
     endif()
     unset(_PYTHON_VERSION_RESULT)

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

Summary of changes:
 Modules/FindPythonInterp.cmake |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake