From c9ab9590aa1d44ea139b16e7ffcb1461d928bdd5 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Thu, 4 Oct 2012 03:12:48 +0000
Subject: Removing server-related cmake cruft.  Fixing libGLU warnings on
 linux.

---
 indra/cmake/OpenGL.cmake | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'indra/cmake/OpenGL.cmake')

diff --git a/indra/cmake/OpenGL.cmake b/indra/cmake/OpenGL.cmake
index 0a3dd976b4..bafb2a460f 100644
--- a/indra/cmake/OpenGL.cmake
+++ b/indra/cmake/OpenGL.cmake
@@ -1,8 +1,15 @@
 # -*- cmake -*-
+
+#if (INSTALL_PROPRIETARY)
+#  set(HEADLESS ON CACHE BOOL "Use headless mesa library.")
+#endif (INSTALL_PROPRIETARY)
+
 include(Prebuilt)
 
-if (NOT STANDALONE)
-  use_prebuilt_binary(glext)
-  use_prebuilt_binary(glh_linear)
-  set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
-endif (NOT STANDALONE)
+if (LINUX AND NOT STANDALONE)
+  use_prebuilt_binary(mesa)
+  SET(OPENGL_glu_LIBRARY GLU)
+endif (LINUX AND NOT STANDALONE)
+
+include(FindOpenGL)
+
-- 
cgit v1.3