[Cmake-commits] CMake branch, next, updated. v2.8.7-2913-ge71564d

[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  e71564dfd269193c41987e0e0102d3b6d99a7971 (commit)
       via  8ac1a03fc3f42c551e800f0b7b0848d63514fb6d (commit)
      from  4d2dcca6998e1e38dc0aaa69223cad7c0ffcb8a5 (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=e71564dfd269193c41987e0e0102d3b6d99a7971
commit e71564dfd269193c41987e0e0102d3b6d99a7971
Merge: 4d2dcca 8ac1a03
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Feb 27 11:30:54 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 27 11:30:54 2012 -0500

    Merge topic 'findpythoninterp-version-detection' into next
    
    8ac1a03 FindPythonInterp: omit patchlevel 0 from PYTHON_VERSION_STRING


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ac1a03fc3f42c551e800f0b7b0848d63514fb6d
commit 8ac1a03fc3f42c551e800f0b7b0848d63514fb6d
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Feb 27 17:30:45 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Feb 27 17:30:45 2012 +0100

    FindPythonInterp: omit patchlevel 0 from PYTHON_VERSION_STRING

diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
index a2d6224..babbd4b 100644
--- a/Modules/FindPythonInterp.cmake
+++ b/Modules/FindPythonInterp.cmake
@@ -99,6 +99,10 @@ if(PYTHON_EXECUTABLE)
         list(GET _VERSION 0 PYTHON_VERSION_MAJOR)
         list(GET _VERSION 1 PYTHON_VERSION_MINOR)
         list(GET _VERSION 2 PYTHON_VERSION_PATCH)
+        if(PYTHON_VERSION_PATCH EQUAL 0)
+            # it's called "Python 2.7", not "2.7.0"
+            string(REGEX REPLACE "\\.0$" "" PYTHON_VERSION_STRING "${PYTHON_VERSION_STRING}")
+        endif()
     else()
         # sys.version predates sys.version_info, so use that
         execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys; sys.stdout.write(sys.version)"

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

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


hooks/post-receive
-- 
CMake