[Cmake-commits] CMake branch, next, updated. v2.8.8-3019-gbd70528

[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  bd705288cbcd6ca672ccb3ff30019a517bb269f7 (commit)
       via  9d145b0998f21ae6d0571c5b6a7ab0168722df7c (commit)
      from  2bc3ff0e0c1b12d7eba5306c3b66aad1fbddc881 (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=bd705288cbcd6ca672ccb3ff30019a517bb269f7
commit bd705288cbcd6ca672ccb3ff30019a517bb269f7
Merge: 2bc3ff0 9d145b0
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Jun 5 15:00:42 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 5 15:00:42 2012 -0400

    Merge topic 'FindPythonLibs-13216' into next
    
    9d145b0 FindPythonLibs: honor EXACT version specification (#13216)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d145b0998f21ae6d0571c5b6a7ab0168722df7c
commit 9d145b0998f21ae6d0571c5b6a7ab0168722df7c
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Jun 5 20:02:58 2012 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Jun 5 21:00:24 2012 +0200

    FindPythonLibs: honor EXACT version specification (#13216)

diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index 478ebcb..11ff196 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -45,13 +45,19 @@ IF(PythonLibs_FIND_VERSION)
         STRING(REGEX REPLACE "^([0-9]+\\.[0-9]+).*" "\\1" _PYTHON_FIND_MAJ_MIN "${PythonLibs_FIND_VERSION}")
         STRING(REGEX REPLACE "^([0-9]+).*" "\\1" _PYTHON_FIND_MAJ "${_PYTHON_FIND_MAJ_MIN}")
         UNSET(_PYTHON_FIND_OTHER_VERSIONS)
-        IF(NOT PythonLibs_FIND_VERSION_EXACT)
+        IF(PythonLibs_FIND_VERSION_EXACT)
+            IF(_PYTHON_FIND_MAJ_MIN STREQUAL PythonLibs_FIND_VERSION)
+                SET(_PYTHON_FIND_OTHER_VERSIONS "${PythonLibs_FIND_VERSION}")
+            ELSE(_PYTHON_FIND_MAJ_MIN STREQUAL PythonLibs_FIND_VERSION)
+                SET(_PYTHON_FIND_OTHER_VERSIONS "${PythonLibs_FIND_VERSION}" "${_PYTHON_FIND_MAJ_MIN}")
+            ENDIF(_PYTHON_FIND_MAJ_MIN STREQUAL PythonLibs_FIND_VERSION)
+        ELSE(PythonLibs_FIND_VERSION_EXACT)
             FOREACH(_PYTHON_V ${_PYTHON${_PYTHON_FIND_MAJ}_VERSIONS})
                 IF(NOT _PYTHON_V VERSION_LESS _PYTHON_FIND_MAJ_MIN)
                     LIST(APPEND _PYTHON_FIND_OTHER_VERSIONS ${_PYTHON_V})
                 ENDIF()
              ENDFOREACH()
-        ENDIF(NOT PythonLibs_FIND_VERSION_EXACT)
+        ENDIF(PythonLibs_FIND_VERSION_EXACT)
         UNSET(_PYTHON_FIND_MAJ_MIN)
         UNSET(_PYTHON_FIND_MAJ)
     ELSE(PythonLibs_FIND_VERSION MATCHES "^[0-9]+\\.[0-9]+(\\.[0-9]+.*)?$")

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

Summary of changes:


hooks/post-receive
-- 
CMake