From 8edf8b002db02af0abca1b06802bc0041f25c379 Mon Sep 17 00:00:00 2001
From: Nyx Linden <nyx@lindenlab.com>
Date: Thu, 20 Sep 2012 17:49:48 +0000
Subject: [PATCH] BUILDFIX: not including headless libraries if we haven't
defined llrenderheadless
---
indra/llrender/CMakeLists.txt | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/indra/llrender/CMakeLists.txt b/indra/llrender/CMakeLists.txt
index 638ab23bd64..f31446924fe 100644
--- a/indra/llrender/CMakeLists.txt
+++ b/indra/llrender/CMakeLists.txt
@@ -89,7 +89,6 @@ if ((SERVER OR BAKING) AND NOT WINDOWS AND NOT DARWIN)
llrender
)
-
set_source_files_properties(
${server_SOURCE_FILES}
PROPERTIES
@@ -99,12 +98,8 @@ if ((SERVER OR BAKING) AND NOT WINDOWS AND NOT DARWIN)
${llrender_SOURCE_FILES}
${server_SOURCE_FILES}
)
-endif ((SERVER OR BAKING) AND NOT WINDOWS AND NOT DARWIN)
-add_library (llrender ${llrender_SOURCE_FILES})
-# Libraries on which this library depends, needed for Linux builds
-# Sort by high-level to low-level
-target_link_libraries(llrender
+target_link_libraries(llrenderheadless
${LLCOMMON_LIBRARIES}
${LLIMAGE_LIBRARIES}
${LLMATH_LIBRARIES}
@@ -113,10 +108,14 @@ target_link_libraries(llrender
${LLXML_LIBRARIES}
${LLVFS_LIBRARIES}
${LLWINDOW_LIBRARIES}
- ${FREETYPE_LIBRARIES}
${OPENGL_LIBRARIES})
-target_link_libraries(llrenderheadless
+endif ((SERVER OR BAKING) AND NOT WINDOWS AND NOT DARWIN)
+
+add_library (llrender ${llrender_SOURCE_FILES})
+# Libraries on which this library depends, needed for Linux builds
+# Sort by high-level to low-level
+target_link_libraries(llrender
${LLCOMMON_LIBRARIES}
${LLIMAGE_LIBRARIES}
${LLMATH_LIBRARIES}
@@ -125,5 +124,6 @@ target_link_libraries(llrenderheadless
${LLXML_LIBRARIES}
${LLVFS_LIBRARIES}
${LLWINDOW_LIBRARIES}
+ ${FREETYPE_LIBRARIES}
${OPENGL_LIBRARIES})
--
GitLab