From 1c78e0d301ae23398f4c1572ce493cf7bc950ef5 Mon Sep 17 00:00:00 2001
From: David Seikel
Date: Wed, 2 Mar 2011 23:22:54 +1000
Subject: Look for more versions of python.  Isn't pythen wonderful like that? 
 Noooot!

---
 linden/indra/cmake/Python.cmake | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/cmake/Python.cmake b/linden/indra/cmake/Python.cmake
index e4257f4..6cdd559 100644
--- a/linden/indra/cmake/Python.cmake
+++ b/linden/indra/cmake/Python.cmake
@@ -6,15 +6,15 @@ if (WINDOWS)
   # On Windows, explicitly avoid Cygwin Python.
 
   find_program(PYTHON_EXECUTABLE
-    NAMES python25.exe python23.exe python.exe
+    NAMES python27.exe python26.exe python25.exe python24.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.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.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]
@@ -23,7 +23,7 @@ if (WINDOWS)
 elseif (EXISTS /etc/debian_version)
   # On Debian and Ubuntu, avoid Python 2.4 if possible.
 
-  find_program(PYTHON_EXECUTABLE python2.5 python2.3 python PATHS /usr/bin)
+  find_program(PYTHON_EXECUTABLE python2.7 python2.6 python2.5 python2.3 python PATHS /usr/bin)
 
   if (PYTHON_EXECUTABLE)
     set(PYTHONINTERP_FOUND ON)
@@ -33,7 +33,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 
   string(REPLACE ":" ";" PATH_LIST "$ENV{PATH}")
   find_program(PYTHON_EXECUTABLE
-    NAMES python python25 python24 python23
+    NAMES python python27 python26 python25 python24 python23
     NO_DEFAULT_PATH # Avoid searching non-standard locations first
     PATHS
     /bin
@@ -54,3 +54,4 @@ if (NOT PYTHON_EXECUTABLE)
 endif (NOT PYTHON_EXECUTABLE)
 
 mark_as_advanced(PYTHON_EXECUTABLE)
+
-- 
cgit v1.1