diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-12-29 13:23:02 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-12-29 13:23:02 -0500 |
commit | 5f99331f4a9ed5ed78af7b47bdad152949e63ec4 (patch) | |
tree | 78aa91b7a1ac5f31a4e1de11f1a30d4b53561a05 /indra/llwindow | |
parent | ed365b9c0eea12fa30629be7d26605b77eeedc05 (diff) | |
parent | 087c105317058dc3a011c937a5aceaf87fdecc26 (diff) |
Automated merge up from viewer-development
Diffstat (limited to 'indra/llwindow')
-rw-r--r-- | indra/llwindow/CMakeLists.txt | 5 |
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 |