[Cmake-commits] CMake branch, next, updated. v2.8.2-888-g6dcadbc
Brad King
brad.king at kitware.com
Tue Sep 21 17:23:16 EDT 2010
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 6dcadbcba00c1204b94f05e70e905ccca314891c (commit)
via 2f665d5d1f9b4af3f9ece89565ba71bbc56ca05b (commit)
from f3640fa1f479c3784a0e1ff35651ec0868d35f42 (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=6dcadbcba00c1204b94f05e70e905ccca314891c
commit 6dcadbcba00c1204b94f05e70e905ccca314891c
Merge: f3640fa 2f665d5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 21 17:23:15 2010 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 21 17:23:15 2010 -0400
Merge topic 'find-python2.7' into next
2f665d5 FindPythonInterp: Look for python2.7 interpreter
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f665d5d1f9b4af3f9ece89565ba71bbc56ca05b
commit 2f665d5d1f9b4af3f9ece89565ba71bbc56ca05b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 21 17:22:07 2010 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 21 17:22:07 2010 -0400
FindPythonInterp: Look for python2.7 interpreter
Python 2.7 was released on July 3rd, 2010.
diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
index ed6ade6..6c97ba3 100644
--- a/Modules/FindPythonInterp.cmake
+++ b/Modules/FindPythonInterp.cmake
@@ -7,7 +7,7 @@
#
#=============================================================================
-# Copyright 2005-2009 Kitware, Inc.
+# Copyright 2005-2010 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
@@ -20,8 +20,9 @@
# License text for the above reference.)
FIND_PROGRAM(PYTHON_EXECUTABLE
- NAMES python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python
+ NAMES python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python
PATHS
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
-----------------------------------------------------------------------
Summary of changes:
Modules/FindPythonInterp.cmake | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list