[Cmake-commits] CMake branch, next, updated. v2.8.7-3371-gbfadd7d

[Ben Boeckel]

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  bfadd7dea5b0f6d1928ecf6ee4edf2a9a0a7e500 (commit)
       via  4bdec581b3a5a32239370e87aa2f7cadcb058aae (commit)
       via  6a46f5ce809185e0c7dbd3d618eb4bbde808827b (commit)
      from  c25ef678069669da81d0ac334b1a4c25c1d6358e (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=bfadd7dea5b0f6d1928ecf6ee4edf2a9a0a7e500
commit bfadd7dea5b0f6d1928ecf6ee4edf2a9a0a7e500
Merge: c25ef67 4bdec58
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Mar 29 14:03:21 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 29 14:03:21 2012 -0400

    Merge topic 'dev/fix-python3-findmodule' into next
    
    4bdec58 Search for other ABIFLAGS builds of Python
    6a46f5c Don't put legacy variables back into the cache


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4bdec581b3a5a32239370e87aa2f7cadcb058aae
commit 4bdec581b3a5a32239370e87aa2f7cadcb058aae
Author:     Ben Boeckel <mathstuf at gmail.com>
AuthorDate: Tue Mar 27 16:24:43 2012 -0400
Commit:     Ben Boeckel <mathstuf at gmail.com>
CommitDate: Tue Mar 27 16:37:50 2012 -0400

    Search for other ABIFLAGS builds of Python
    
    Starting with Python3, standard Python installs may have additional ABI
    flags attached to include directories and library names. As of 3.2, the
    following flags are in the configure file:
    
        d -> --with-debug
        m -> --with-pymalloc
        u -> --with-wide-unicode
    
    Python 3.3 seems to no longer have --with-wide-unicode. Hopefully Python
    will ensure that the possible flags always show up in a stable order.
    The 'd' flag is ignored since the debug library is considered separate.
    
    There is still the problem where ABI flags cannot be specified in
    find_package since the letters confuse the version comparator.

diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index e833150..591b3e6 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -82,7 +82,12 @@ FOREACH(_CURRENT_VERSION ${_Python_VERSIONS})
   ENDIF(WIN32)
 
   FIND_LIBRARY(PYTHON_LIBRARY
-    NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION}
+    NAMES
+    python${_CURRENT_VERSION_NO_DOTS}
+    python${_CURRENT_VERSION}mu
+    python${_CURRENT_VERSION}m
+    python${_CURRENT_VERSION}u
+    python${_CURRENT_VERSION}
     PATHS
       [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
       [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
@@ -120,6 +125,9 @@ FOREACH(_CURRENT_VERSION ${_Python_VERSIONS})
       [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
       [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
     PATH_SUFFIXES
+      python${_CURRENT_VERSION}mu
+      python${_CURRENT_VERSION}m
+      python${_CURRENT_VERSION}u
       python${_CURRENT_VERSION}
   )
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a46f5ce809185e0c7dbd3d618eb4bbde808827b
commit 6a46f5ce809185e0c7dbd3d618eb4bbde808827b
Author:     Ben Boeckel <mathstuf at gmail.com>
AuthorDate: Tue Mar 27 16:21:06 2012 -0400
Commit:     Ben Boeckel <mathstuf at gmail.com>
CommitDate: Tue Mar 27 16:21:06 2012 -0400

    Don't put legacy variables back into the cache
    
    If PYTHON_INCLUDE_PATH is put into the cache, then it will always
    override whatever might be found and PYTHON_INCLUDE_DIR is never given a
    chance to find something different. It being marked as INTERNAL also
    means that it cannot be changed without editing CMakeCache.txt directly.
    
    Basically, the scenario is that if the Python version is changed, then
    deleting PYTHON_INCLUDE_DIR doesn't work because any cached
    PYTHON_INCLUDE_PATH variable is set before find_path is even called. Any
    build tree using a previous version will still need either manual
    removal of PYTHON_INCLUDE_PATH or a complete reconfigure, but in the
    future changing the Python version can be accomplished by deleting
    PYTHON_INCLUDE_DIR and reconfiguring with the new version.

diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index fcd0838..e833150 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -123,9 +123,8 @@ FOREACH(_CURRENT_VERSION ${_Python_VERSIONS})
       python${_CURRENT_VERSION}
   )
 
-  # For backward compatibility, set PYTHON_INCLUDE_PATH, but make it internal.
-  SET(PYTHON_INCLUDE_PATH "${PYTHON_INCLUDE_DIR}" CACHE INTERNAL
-    "Path to where Python.h is found (deprecated)")
+  # For backward compatibility, set PYTHON_INCLUDE_PATH.
+  SET(PYTHON_INCLUDE_PATH "${PYTHON_INCLUDE_DIR}")
 
   IF(PYTHON_INCLUDE_DIR AND EXISTS "${PYTHON_INCLUDE_DIR}/patchlevel.h")
     FILE(STRINGS "${PYTHON_INCLUDE_DIR}/patchlevel.h" python_version_str

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

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


hooks/post-receive
-- 
CMake