diff options
| author | Don Kjer <don@lindenlab.com> | 2012-10-04 03:12:48 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-10-04 03:12:48 +0000 |
| commit | c9ab9590aa1d44ea139b16e7ffcb1461d928bdd5 (patch) | |
| tree | c735cd065521eb5b2d719f78e1685c090b265ea6 /indra/llwindow | |
| parent | 8c0aa31536c447edb6ef4fbee43f99debf593a20 (diff) | |
Removing server-related cmake cruft. Fixing libGLU warnings on linux.
Diffstat (limited to 'indra/llwindow')
| -rw-r--r-- | indra/llwindow/CMakeLists.txt | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt index 4db58be776..5fef44f9cb 100644 --- a/indra/llwindow/CMakeLists.txt +++ b/indra/llwindow/CMakeLists.txt @@ -62,7 +62,7 @@ set(viewer_HEADER_FILES # Libraries on which this library depends, needed for Linux builds # Sort by high-level to low-level -if (LINUX AND VIEWER) +if (LINUX) set(llwindow_LINK_LIBRARIES ${LLCOMMON_LIBRARIES} ${LLIMAGE_LIBRARIES} @@ -75,7 +75,7 @@ if (LINUX AND VIEWER) ${SDL_LIBRARY} fontconfig # For FCInit and other FC* functions. ) -endif (LINUX AND VIEWER) +endif (LINUX) if (DARWIN) list(APPEND llwindow_SOURCE_FILES @@ -98,7 +98,7 @@ if (DARWIN) ) endif (DARWIN) -if (LINUX AND VIEWER) +if (LINUX) list(APPEND viewer_SOURCE_FILES llkeyboardsdl.cpp llwindowsdl.cpp @@ -107,7 +107,7 @@ if (LINUX AND VIEWER) llkeyboardsdl.h llwindowsdl.h ) -endif (LINUX AND VIEWER) +endif (LINUX) if (WINDOWS) list(APPEND llwindow_SOURCE_FILES @@ -171,11 +171,9 @@ endif (llwindow_HEADER_FILES) list(APPEND viewer_SOURCE_FILES ${viewer_HEADER_FILES}) -if (VIEWER) - add_library (llwindow - ${llwindow_SOURCE_FILES} - ${viewer_SOURCE_FILES} - ) - target_link_libraries (llwindow ${llwindow_LINK_LIBRARIES}) -endif (VIEWER) +add_library (llwindow + ${llwindow_SOURCE_FILES} + ${viewer_SOURCE_FILES} + ) +target_link_libraries (llwindow ${llwindow_LINK_LIBRARIES}) |