[Cmake-commits] CMake branch, next, updated. v2.8.7-2800-g4789bae

[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  4789bae0797b09feb300dcd97f1ca362bbf35ff7 (commit)
       via  7c95631da9dc9885e67d7ae23efc0d932318a1be (commit)
       via  82e71fe32af6db1202cd4750484b327b7778c622 (commit)
      from  15f77be8b71be6cf3f41748d27054cd9525d5657 (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=4789bae0797b09feb300dcd97f1ca362bbf35ff7
commit 4789bae0797b09feb300dcd97f1ca362bbf35ff7
Merge: 15f77be 7c95631
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Feb 22 11:29:14 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 22 11:29:14 2012 -0500

    Merge topic 'improve-findpythonlibs' into next
    
    7c95631 AllFindModules test: require Python versions
    82e71fe FindPythonLibs: stop scanning when libraries are found


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c95631da9dc9885e67d7ae23efc0d932318a1be
commit 7c95631da9dc9885e67d7ae23efc0d932318a1be
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Feb 22 17:28:58 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Feb 22 17:28:58 2012 +0100

    AllFindModules test: require Python versions

diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
index 9257fcc..185b07c 100644
--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
@@ -50,7 +50,7 @@ endif (NOT QT4_FOUND)
 set(VERSIONS_REQUIRED
     ALSA BISON BZIP2 CUPS CURL DOXYGEN EXPAT FLEX FREETYPE GETTEXT GIF GIT
     ImageMagick JASPER LibArchive LIBXML2 LIBXSLT PERL PKG_CONFIG PostgreSQL
-    SWIG TIFF ZLIB)
+    PYTHON PYTHONLIBS SWIG TIFF ZLIB)
 
 foreach(VTEST ${VERSIONS_REQUIRED})
     if (${VTEST}_FOUND)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82e71fe32af6db1202cd4750484b327b7778c622
commit 82e71fe32af6db1202cd4750484b327b7778c622
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Feb 22 17:25:08 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Feb 22 17:25:08 2012 +0100

    FindPythonLibs: stop scanning when libraries are found

diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index 6360d53..469e89f 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -135,6 +135,9 @@ FOREACH(_CURRENT_VERSION ${_Python_VERSIONS})
     UNSET(python_version_str)
   ENDIF(PYTHON_INCLUDE_DIR AND EXISTS "${PYTHON_INCLUDE_DIR}/patchlevel.h")
 
+  IF(PYTHON_LIBRARY AND PYTHON_INCLUDE_DIR)
+    BREAK()
+  ENDIF(PYTHON_LIBRARY AND PYTHON_INCLUDE_DIR)
 ENDFOREACH(_CURRENT_VERSION)
 
 MARK_AS_ADVANCED(

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

Summary of changes:
 Modules/FindPythonLibs.cmake                  |    3 +++
 Tests/CMakeOnly/AllFindModules/CMakeLists.txt |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake