[Cmake-commits] CMake branch, next, updated. v2.8.7-2832-g4f6def4

[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  4f6def4cc58dfa97340e330c8ef237619bcbb8f9 (commit)
       via  69656b635474533e1345e31b0d5fa7c044a0d30d (commit)
      from  4ca5d3bc273000355b7ba620440c2d6aa6760d79 (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=4f6def4cc58dfa97340e330c8ef237619bcbb8f9
commit 4f6def4cc58dfa97340e330c8ef237619bcbb8f9
Merge: 4ca5d3b 69656b6
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Feb 23 12:46:45 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 23 12:46:45 2012 -0500

    Merge topic 'improve-findpythonlibs' into next
    
    69656b6 FindPythonLibs: stop scanning when libraries are found


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=69656b635474533e1345e31b0d5fa7c044a0d30d
commit 69656b635474533e1345e31b0d5fa7c044a0d30d
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: Thu Feb 23 18:45:29 2012 +0100

    FindPythonLibs: stop scanning when libraries are found

diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index 6360d53..fcd0838 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(
@@ -156,6 +159,10 @@ SET(PYTHON_LIBRARY_DEBUG "${PYTHON_DEBUG_LIBRARY}")
 SET(PYTHON_LIBRARY_RELEASE "${PYTHON_LIBRARY}")
 INCLUDE(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
 SELECT_LIBRARY_CONFIGURATIONS(PYTHON)
+# SELECT_LIBRARY_CONFIGURATIONS() sets ${PREFIX}_FOUND if it has a library.
+# Unset this, this prefix doesn't match the module prefix, they are different
+# for historical reasons.
+UNSET(PYTHON_FOUND)
 
 INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibs

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

Summary of changes:


hooks/post-receive
-- 
CMake