From 49caededb4bf5beb8b87ebee034c1d969968af4d Mon Sep 17 00:00:00 2001
From: Nyx Linden <nyx@lindenlab.com>
Date: Wed, 19 Sep 2012 17:05:56 +0000
Subject: BUILDFIX: enabling the building of the viewer/appearance backend with
 headless mesa

---
 indra/cmake/LLRender.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/indra/cmake/LLRender.cmake b/indra/cmake/LLRender.cmake
index 8427928151..6695ed6bd9 100644
--- a/indra/cmake/LLRender.cmake
+++ b/indra/cmake/LLRender.cmake
@@ -8,15 +8,15 @@ set(LLRENDER_INCLUDE_DIRS
     ${GLH_INCLUDE_DIR}
     )
 
-if (SERVER AND LINUX)
+if ((SERVER OR BAKING) AND LINUX)
   set(LLRENDER_LIBRARIES
       llrenderheadless
       )
-else (SERVER AND LINUX)
+else ((SERVER OR BAKING) AND LINUX)
 set(LLRENDER_LIBRARIES
     llrender
     )
-endif (SERVER AND LINUX)
+endif ((SERVER OR BAKING) AND LINUX)
 
 # mapserver requires certain files to be copied so LL_MESA_HEADLESS can be set
 # differently for different object files.
-- 
cgit v1.2.3


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/LLRender.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/indra/cmake/LLRender.cmake b/indra/cmake/LLRender.cmake
index 6695ed6bd9..c2f6fc67cd 100644
--- a/indra/cmake/LLRender.cmake
+++ b/indra/cmake/LLRender.cmake
@@ -8,15 +8,15 @@ set(LLRENDER_INCLUDE_DIRS
     ${GLH_INCLUDE_DIR}
     )
 
-if ((SERVER OR BAKING) AND LINUX)
+if ((BAKING) AND LINUX)
   set(LLRENDER_LIBRARIES
       llrenderheadless
       )
-else ((SERVER OR BAKING) AND LINUX)
+else ((BAKING) AND LINUX)
 set(LLRENDER_LIBRARIES
     llrender
     )
-endif ((SERVER OR BAKING) AND LINUX)
+endif ((BAKING) AND LINUX)
 
 # mapserver requires certain files to be copied so LL_MESA_HEADLESS can be set
 # differently for different object files.
-- 
cgit v1.2.3


From 21df924a10c1c32f7fc28bb29b20dc2179863b24 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Thu, 4 Oct 2012 06:29:07 +0000
Subject: Building headless and non-headless libraries side-by-side, removing
 the need for the BAKING cmake setting.

---
 indra/cmake/LLRender.cmake | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

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

diff --git a/indra/cmake/LLRender.cmake b/indra/cmake/LLRender.cmake
index c2f6fc67cd..ae71ee4c0d 100644
--- a/indra/cmake/LLRender.cmake
+++ b/indra/cmake/LLRender.cmake
@@ -1,5 +1,6 @@
 # -*- cmake -*-
 
+include(Variables)
 include(FreeType)
 include(GLH)
 
@@ -8,27 +9,12 @@ set(LLRENDER_INCLUDE_DIRS
     ${GLH_INCLUDE_DIR}
     )
 
-if ((BAKING) AND LINUX)
-  set(LLRENDER_LIBRARIES
-      llrenderheadless
-      )
-else ((BAKING) AND LINUX)
+if (BUILD_HEADLESS)
+  set(LLRENDER_HEADLESS_LIBRARIES
+    llrenderheadless
+    )
+endif (BUILD_HEADLESS)
 set(LLRENDER_LIBRARIES
     llrender
     )
-endif ((BAKING) 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 )
-  foreach (PREFIX ${ARGV})
-    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


From bf6182daa8b4d7cea79310547f71d7a3155e17b0 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Fri, 29 Mar 2013 07:50:08 -0700
Subject: Update Mac and Windows breakpad builds to latest

---
 indra/cmake/LLRender.cmake | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 indra/cmake/LLRender.cmake

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

diff --git a/indra/cmake/LLRender.cmake b/indra/cmake/LLRender.cmake
old mode 100644
new mode 100755
-- 
cgit v1.2.3