From 939a506569433db7bff96c12200f03b3f85f40de Mon Sep 17 00:00:00 2001
From: Eric Tulla <tulla@lindenlab.com>
Date: Mon, 30 Jun 2008 17:57:00 +0000
Subject: Merging in file-move-merge ( QAR-649 ) Result of "svn merge -r
 90669:90786 $tulla/file-move-merge ."

Be careful of future merges involving changes to any of these moved files as SVN usually does the wrong thing:
newview/llglslshader.* -> llrender/llglslshader.*, llrender/llshadermgr.*, newview/llviewershadermgr.* (gets split into 3 separate files)
newview/llpostprocess.* -> llrender/llpostprocess.*
newview/llrendersphere.* -> llrender/llrendersphere.*
newview/llcubemap.* -> llrender/llcubemap.*
llwindow/llgl.* -> llrender/llgl.*
llwindow/llglstates.h -> llrender/llglstates.h
llwindow/llgltypes.h -> llrender/llgltypes.h
llwindow/llglheaders.h -> llrender/llglheaders.h
---
 indra/cmake/LLRender.cmake | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'indra/cmake')

diff --git a/indra/cmake/LLRender.cmake b/indra/cmake/LLRender.cmake
index 8fda6c1d6a..bbcf4cd57d 100644
--- a/indra/cmake/LLRender.cmake
+++ b/indra/cmake/LLRender.cmake
@@ -6,6 +6,27 @@ set(LLRENDER_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llrender
     )
 
+if (SERVER AND LINUX)
+  set(LLRENDER_LIBRARIES
+      llrenderheadless
+      )
+else (SERVER AND LINUX)
 set(LLRENDER_LIBRARIES
     llrender
     )
+endif (SERVER AND LINUX)
+
+# mapserver requires certain files to be copied so LL_MESA_HEADLESS can be set
+# differently for different object files.
+macro (copy_server_sources _copied_SOURCES)
+  foreach (PREFIX ${_copied_SOURCES})
+    add_custom_command(
+        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PREFIX}_server.cpp
+        COMMAND ${CMAKE_COMMAND}
+        ARGS -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${PREFIX}.cpp
+             ${CMAKE_CURRENT_BINARY_DIR}/${PREFIX}_server.cpp
+        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${PREFIX}.cpp
+        )
+    list(APPEND server_SOURCE_FILES ${PREFIX}_server.cpp)
+  endforeach (PREFIX ${_copied_SOURCES})
+endmacro (copy_server_sources _copied_SOURCES)
-- 
cgit v1.2.3