summaryrefslogtreecommitdiff
path: root/indra/llwindow
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2011-01-07 10:48:38 -0800
committerDon Kjer <don@lindenlab.com>2011-01-07 10:48:38 -0800
commit829c2c86975dd80d13008c38246fa8ea0d10529c (patch)
treee90bda161771de9f3fcd98e2806e8eed7c4222fc /indra/llwindow
parenta9bc51e6416dd637080c0307de99d5e09d06dcc4 (diff)
parentc132d20a7433e2d09e3521a15497f661fcbd18b8 (diff)
Merge from viewer-development
Diffstat (limited to 'indra/llwindow')
-rw-r--r--indra/llwindow/CMakeLists.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
index bf3233f386..4d2677fd91 100644
--- a/indra/llwindow/CMakeLists.txt
+++ b/indra/llwindow/CMakeLists.txt
@@ -59,12 +59,13 @@ set(viewer_HEADER_FILES
# Libraries on which this library depends, needed for Linux builds
# Sort by high-level to low-level
-if (NOT LINUX OR VIEWER)
+if (LINUX AND VIEWER)
set(llwindow_LINK_LIBRARIES
${UI_LIBRARIES} # for GTK
${SDL_LIBRARY}
+ fontconfig # For FCInit and other FC* functions.
)
-endif (NOT LINUX OR VIEWER)
+endif (LINUX AND VIEWER)
if (DARWIN)
list(APPEND llwindow_SOURCE_FILES