diff options
author | Andrew Meadows <andrew@lindenlab.com> | 2010-12-10 10:40:38 -0800 |
---|---|---|
committer | Andrew Meadows <andrew@lindenlab.com> | 2010-12-10 10:40:38 -0800 |
commit | e040f16a4f2e50592a125a04185fd9f06ac49522 (patch) | |
tree | 60a0e7fee37761a9278db6ab2b32f61fc38acbe1 /indra/cmake/Python.cmake | |
parent | c320b2cef916cc8f0e42f041c29c04bf55d40d77 (diff) | |
parent | 02701073ce70fc2e2043adf0ed7e0d6879669215 (diff) |
merge
Diffstat (limited to 'indra/cmake/Python.cmake')
-rw-r--r-- | indra/cmake/Python.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/cmake/Python.cmake b/indra/cmake/Python.cmake index 0901c1b7a2..748c8c2bec 100644 --- a/indra/cmake/Python.cmake +++ b/indra/cmake/Python.cmake @@ -9,10 +9,12 @@ if (WINDOWS) NAMES python25.exe python23.exe python.exe NO_DEFAULT_PATH # added so that cmake does not find cygwin 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] [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath] + [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath] [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath] [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath] [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath] |