[Cmake-commits] CMake branch, next, updated. v2.8.7-2042-g30a3a1a

[Brad King]

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  30a3a1a72bd745ac7da3c9d5f91894eab3d7b9e6 (commit)
       via  a04ced3b38cc1ac7903a219c8abc9e31dfe5fbe8 (commit)
      from  4045f5a1d2360f22f05a8b2894978839656d8409 (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=30a3a1a72bd745ac7da3c9d5f91894eab3d7b9e6
commit 30a3a1a72bd745ac7da3c9d5f91894eab3d7b9e6
Merge: 4045f5a a04ced3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 09:59:55 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 09:59:55 2012 -0500

    Merge topic 'FindPythonLibs-single-user-issue-12869' into next
    
    a04ced3 FindPythonLibs: Search for single-user installs on Windows


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a04ced3b38cc1ac7903a219c8abc9e31dfe5fbe8
commit a04ced3b38cc1ac7903a219c8abc9e31dfe5fbe8
Author:     Christian Andersson <chria at maths.lth.se>
AuthorDate: Tue Jan 10 09:55:42 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 10 09:58:43 2012 -0500

    FindPythonLibs: Search for single-user installs on Windows
    
    When cmake searches for Python libs in Windows it searches in:
    
      [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
    
    However, the information might not always reside there.  The information
    could also reside in:
    
      [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
    
    when one installs Python for a single user and not for all users.

diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index adcec46..da7a1ac 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -40,13 +40,17 @@ FOREACH(_CURRENT_VERSION ${_Python_VERSIONS})
       NAMES python${_CURRENT_VERSION_NO_DOTS}_d python
       PATHS
       [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs/Debug
-      [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs )
+      [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs/Debug
+      [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
+      [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
+      )
   ENDIF(WIN32)
 
   FIND_LIBRARY(PYTHON_LIBRARY
     NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION}
     PATHS
       [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
+      [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
     # Avoid finding the .dll in the PATH.  We want the .lib.
     NO_SYSTEM_ENVIRONMENT_PATH
   )
@@ -79,6 +83,7 @@ FOREACH(_CURRENT_VERSION ${_Python_VERSIONS})
     PATHS
       ${PYTHON_FRAMEWORK_INCLUDES}
       [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}
   )

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

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


hooks/post-receive
-- 
CMake