diff options
| author | Jacek Antonelli | 2009-01-13 00:19:34 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2009-01-13 00:19:34 -0600 |
| commit | 106b2a600c59404ef6bb95b77f8bbf271b659baa (patch) | |
| tree | 4f9394f0ca34003347de3dffff40efd8a3a43c6c /linden/indra/cmake/Python.cmake | |
| parent | Merge 1.1.0 alpha into quickfilter (diff) | |
| parent | Merge commit 'mccabe/1.1.0a-gstreamer' into 1.1.0a (diff) | |
| download | meta-impy-106b2a600c59404ef6bb95b77f8bbf271b659baa.zip meta-impy-106b2a600c59404ef6bb95b77f8bbf271b659baa.tar.gz meta-impy-106b2a600c59404ef6bb95b77f8bbf271b659baa.tar.bz2 meta-impy-106b2a600c59404ef6bb95b77f8bbf271b659baa.tar.xz | |
Merge branch '1.1.0a-gstreamer' into next
Diffstat (limited to 'linden/indra/cmake/Python.cmake')
| -rw-r--r-- | linden/indra/cmake/Python.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/cmake/Python.cmake b/linden/indra/cmake/Python.cmake index e9505fb..4f86d32 100644 --- a/linden/indra/cmake/Python.cmake +++ b/linden/indra/cmake/Python.cmake | |||
| @@ -9,6 +9,7 @@ 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.6\\InstallPath] | ||
| 12 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath] | 13 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath] |
| 13 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath] | 14 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath] |
| 14 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath] | 15 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath] |