diff options
author | Brad King <brad.king@kitware.com> | 2010-09-22 17:51:52 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-09-22 17:51:52 (GMT) |
commit | 6a72c7e9ad4ed1b5143ee4293aebcb097d2d548b (patch) | |
tree | 3cf1ca93555ef1877e3a31b974bec3276eb20a70 /Modules | |
parent | d65a91dd4546a5ae10d4dcfe1598f3dcd55c6f48 (diff) | |
parent | 2f665d5d1f9b4af3f9ece89565ba71bbc56ca05b (diff) | |
download | CMake-6a72c7e9ad4ed1b5143ee4293aebcb097d2d548b.zip CMake-6a72c7e9ad4ed1b5143ee4293aebcb097d2d548b.tar.gz CMake-6a72c7e9ad4ed1b5143ee4293aebcb097d2d548b.tar.bz2 |
Merge topic 'find-python2.7'
2f665d5 FindPythonInterp: Look for python2.7 interpreter
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/FindPythonInterp.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
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] |