diff options
| author | McCabe Maxsted | 2010-10-16 22:36:16 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-10-16 22:36:16 -0700 |
| commit | 5adc960633cbb2ff6591334e9a5c7766dc71bcde (patch) | |
| tree | a8c2f8049efeaf0dc9def895179546f3536d3db6 /linden/indra/cmake/Python.cmake | |
| parent | Disabled inventory loading on login unless FetchInventoryOnLogin is true (def... (diff) | |
| download | meta-impy-5adc960633cbb2ff6591334e9a5c7766dc71bcde.zip meta-impy-5adc960633cbb2ff6591334e9a5c7766dc71bcde.tar.gz meta-impy-5adc960633cbb2ff6591334e9a5c7766dc71bcde.tar.bz2 meta-impy-5adc960633cbb2ff6591334e9a5c7766dc71bcde.tar.xz | |
Added detection for Python 2.7 (currently untested)
Diffstat (limited to 'linden/indra/cmake/Python.cmake')
| -rw-r--r-- | linden/indra/cmake/Python.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/cmake/Python.cmake b/linden/indra/cmake/Python.cmake index 0901c1b..e4257f4 100644 --- a/linden/indra/cmake/Python.cmake +++ b/linden/indra/cmake/Python.cmake | |||
| @@ -9,10 +9,12 @@ if (WINDOWS) | |||
| 9 | NAMES python25.exe python23.exe python.exe | 9 | NAMES python25.exe python23.exe python.exe |
| 10 | NO_DEFAULT_PATH # added so that cmake does not find cygwin python | 10 | NO_DEFAULT_PATH # added so that cmake does not find cygwin python |
| 11 | PATHS | 11 | PATHS |
| 12 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath] | ||
| 12 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath] | 13 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath] |
| 13 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath] | 14 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath] |
| 14 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath] | 15 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath] |
| 15 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath] | 16 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath] |
| 17 | [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath] | ||
| 16 | [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath] | 18 | [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath] |
| 17 | [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath] | 19 | [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath] |
| 18 | [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath] | 20 | [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath] |