From 9db949eec327df4173fde3de934a87bedb0db13c Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Mon, 2 Jun 2008 21:14:31 +0000
Subject: svn merge -r88066:88786
 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge

dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
---
 indra/cmake/LLWindow.cmake | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 indra/cmake/LLWindow.cmake

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

diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake
new file mode 100644
index 0000000000..7a1ecaf0b1
--- /dev/null
+++ b/indra/cmake/LLWindow.cmake
@@ -0,0 +1,40 @@
+# -*- cmake -*-
+
+include(OpenGL)
+
+if (STANDALONE)
+  include(FindSDL)
+
+  # This should be done by FindSDL.  Sigh.
+  mark_as_advanced(
+      SDLMAIN_LIBRARY
+      SDL_INCLUDE_DIR
+      SDL_LIBRARY
+      )
+else (STANDALONE)
+  if (LINUX AND VIEWER)
+    set (SDL_FOUND TRUE)
+    set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/i686-linux)
+    set (SDL_LIBRARY SDL)
+  endif (LINUX AND VIEWER)
+endif (STANDALONE)
+
+if (SDL_FOUND)
+  add_definitions(-DLL_SDL=1)
+  include_directories(${SDL_INCLUDE_DIR})
+endif (SDL_FOUND)
+
+set(LLWINDOW_INCLUDE_DIRS
+    ${GLEXT_INCLUDE_DIR}
+    ${LIBS_OPEN_DIR}/llwindow
+    )
+
+if (SERVER AND LINUX)
+  set(LLWINDOW_LIBRARIES
+      llwindowheadless
+      )
+else (SERVER AND LINUX)
+  set(LLWINDOW_LIBRARIES
+      llwindow
+      )
+endif (SERVER AND LINUX)
-- 
cgit v1.2.3