diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:37:59 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:37:59 -0500 |
| commit | 69b6aa5db2034e8e34bd234a4ebf04763419933a (patch) | |
| tree | 5dd27272bed719fafb4bbb67a184cf57f0106406 /indra/llwindow | |
| parent | 1a9b0523de81c9844aeaa13a3191d9881918bfa8 (diff) | |
| parent | 12bc7eb0179d3154f929252c7ff95a4e8e244c0d (diff) | |
merge changes for storm-669
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 |