diff options
| author | McCabe Maxsted | 2009-09-15 01:49:46 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-09-15 01:49:46 -0700 |
| commit | 549cc042ce6e5cc507cd9a7b98c03ab2d9aa768a (patch) | |
| tree | d30d6668d2fcf87ab7597ae178fcc9846588b9b9 /linden/indra | |
| parent | Fixed unhandled exception in llviewerobjectlist.cpp (diff) | |
| download | meta-impy-549cc042ce6e5cc507cd9a7b98c03ab2d9aa768a.zip meta-impy-549cc042ce6e5cc507cd9a7b98c03ab2d9aa768a.tar.gz meta-impy-549cc042ce6e5cc507cd9a7b98c03ab2d9aa768a.tar.bz2 meta-impy-549cc042ce6e5cc507cd9a7b98c03ab2d9aa768a.tar.xz | |
Applied patch by Robin Cornelius for VWR-11128 - Python not always detected by develop.py
Diffstat (limited to 'linden/indra')
| -rw-r--r-- | linden/indra/cmake/Python.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/cmake/Python.cmake b/linden/indra/cmake/Python.cmake index 4f86d32..0901c1b 100644 --- a/linden/indra/cmake/Python.cmake +++ b/linden/indra/cmake/Python.cmake | |||
| @@ -13,6 +13,10 @@ if (WINDOWS) | |||
| 13 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath] | 13 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath] |
| 14 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath] | 14 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath] |
| 15 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath] | 15 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath] |
| 16 | [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath] | ||
| 17 | [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath] | ||
| 18 | [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath] | ||
| 19 | [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath] | ||
| 16 | ) | 20 | ) |
| 17 | elseif (EXISTS /etc/debian_version) | 21 | elseif (EXISTS /etc/debian_version) |
| 18 | # On Debian and Ubuntu, avoid Python 2.4 if possible. | 22 | # On Debian and Ubuntu, avoid Python 2.4 if possible. |