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 0281d306efe054161c8a3bd1578ba520cd367632 (commit)
via 9d15d3c7486ae2d60709617f3fac9ac8bfb289b3 (commit)
from 730a5480555ddf142e489ec4d4f3828824008a8f (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0281d306efe054161c8a3bd1578ba520cd367632
commit 0281d306efe054161c8a3bd1578ba520cd367632
Merge: 730a548 9d15d3c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Apr 10 13:48:41 2017 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Mon Apr 10 09:48:44 2017 -0400
Stage topic 'FindPythonInterp-3.6-windows'
Topic-id: 23545
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/675
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d15d3c7486ae2d60709617f3fac9ac8bfb289b3
commit 9d15d3c7486ae2d60709617f3fac9ac8bfb289b3
Author: Robert Dailey <rcdai...@gmail.com>
AuthorDate: Fri Apr 7 10:31:12 2017 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Apr 10 09:47:04 2017 -0400
FindPythonInterp: Add `-32` and `-64` registry entry variants
As of 3.6.1 Python (only version tested in this case), installing 32-bit
version on 64-bit windows has a slightly different registry key path.
`-32` is appended to the end of the version number in the path. Also
added a few more registry path guesses based on 64-bit version of
Python.
Also the module now checks if the host is WIN32 instead of the target,
which is required if you are cross compiling.
diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
index f255246..64b98a8 100644
--- a/Modules/FindPythonInterp.cmake
+++ b/Modules/FindPythonInterp.cmake
@@ -91,12 +91,15 @@ unset(_PYTHON3_VERSIONS)
if(NOT PYTHON_EXECUTABLE)
foreach(_CURRENT_VERSION IN LISTS _Python_VERSIONS)
set(_Python_NAMES python${_CURRENT_VERSION})
- if(WIN32)
+ if(CMAKE_HOST_WIN32)
list(APPEND _Python_NAMES python)
endif()
find_program(PYTHON_EXECUTABLE
NAMES ${_Python_NAMES}
- PATHS
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]
+ PATHS
+
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]
+
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}-32\\InstallPath]
+
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}-64\\InstallPath]
)
endforeach()
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/FindPythonInterp.cmake | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
