[Cmake-commits] CMake branch, next, updated. v2.8.7-2835-g2ebf28e

[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  2ebf28ea430b136d67dd50468ea7578842421cf9 (commit)
       via  53d02ea1eae3af89c6802f3f9c32c0284d6e3367 (commit)
       via  91d5a2a386051cb7903044267c5364402bbe190b (commit)
      from  4f6def4cc58dfa97340e330c8ef237619bcbb8f9 (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=2ebf28ea430b136d67dd50468ea7578842421cf9
commit 2ebf28ea430b136d67dd50468ea7578842421cf9
Merge: 4f6def4 53d02ea
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Feb 23 12:49:36 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 23 12:49:36 2012 -0500

    Merge topic 'improve-findpythonlibs' into next
    
    53d02ea FindPythonLibs: stop scanning when libraries are found
    91d5a2a FindPythonLibs: put debug libraries into PYTHON_LIBRARIES


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53d02ea1eae3af89c6802f3f9c32c0284d6e3367
commit 53d02ea1eae3af89c6802f3f9c32c0284d6e3367
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:49:06 2012 +0100

    FindPythonLibs: stop scanning when libraries are found

diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index c9a240c..fcd0838 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -134,6 +134,10 @@ FOREACH(_CURRENT_VERSION ${_Python_VERSIONS})
                          PYTHONLIBS_VERSION_STRING "${python_version_str}")
     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(

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=91d5a2a386051cb7903044267c5364402bbe190b
commit 91d5a2a386051cb7903044267c5364402bbe190b
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Feb 21 21:40:02 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu Feb 23 18:48:24 2012 +0100

    FindPythonLibs: put debug libraries into PYTHON_LIBRARIES

diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index 9401dbb..c9a240c 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -7,7 +7,7 @@
 #  PYTHON_LIBRARIES           - path to the python library
 #  PYTHON_INCLUDE_PATH        - path to where Python.h is found (deprecated)
 #  PYTHON_INCLUDE_DIRS        - path to where Python.h is found
-#  PYTHON_DEBUG_LIBRARIES     - path to the debug library
+#  PYTHON_DEBUG_LIBRARIES     - path to the debug library (deprecated)
 #  PYTHONLIBS_VERSION_STRING  - version of the Python libs found (since CMake 2.8.8)
 #
 # The Python_ADDITIONAL_VERSIONS variable can be used to specify a list of
@@ -134,7 +134,6 @@ FOREACH(_CURRENT_VERSION ${_Python_VERSIONS})
                          PYTHONLIBS_VERSION_STRING "${python_version_str}")
     UNSET(python_version_str)
   ENDIF(PYTHON_INCLUDE_DIR AND EXISTS "${PYTHON_INCLUDE_DIR}/patchlevel.h")
-
 ENDFOREACH(_CURRENT_VERSION)
 
 MARK_AS_ADVANCED(
@@ -148,9 +147,18 @@ MARK_AS_ADVANCED(
 # library. We now set the variables listed by the documentation for this
 # module.
 SET(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
-SET(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
 SET(PYTHON_DEBUG_LIBRARIES "${PYTHON_DEBUG_LIBRARY}")
 
+# These variables have been historically named in this module different from
+# what SELECT_LIBRARY_CONFIGURATIONS() expects.
+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