diff options
| author | Brad King <brad.king@kitware.com> | 2010-12-17 15:31:19 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-12-17 15:31:19 (GMT) |
| commit | 9bcaff02ff066e9bdd69e3e1e3134aa65c53c121 (patch) | |
| tree | 2f46b8a3e84e07b51b20c70065c8a1c26ad47fd5 /Modules/FindPythonInterp.cmake | |
| parent | 544d0c37742a068fa07b265380315a25af3ae9f3 (diff) | |
| parent | 3d13502c986e43f070366d04891c8a3da05e2cb8 (diff) | |
| download | CMake-9bcaff02ff066e9bdd69e3e1e3134aa65c53c121.zip CMake-9bcaff02ff066e9bdd69e3e1e3134aa65c53c121.tar.gz CMake-9bcaff02ff066e9bdd69e3e1e3134aa65c53c121.tar.bz2 | |
Merge branch 'cmake-guiRememberAdvancedCheckbox' into dev/strict-mode
Conflicts:
Source/QtDialog/CMakeSetupDialog.cxx
Diffstat (limited to 'Modules/FindPythonInterp.cmake')
| -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] |