diff options
author | Cinder Roxley <cinder.roxley@phoenixviewer.com> | 2013-06-27 21:31:48 -0600 |
---|---|---|
committer | Cinder Roxley <cinder.roxley@phoenixviewer.com> | 2013-06-27 21:31:48 -0600 |
commit | 97ed20a12bc5b0c0a14534970146425bc854d7fb (patch) | |
tree | 7071c3750cf0b32c12c0fe32cfaecddcfa6da4f0 /indra/llwindow | |
parent | 4cf16ffdfbb166fbb3fcf1d7950ca1a240c94ca1 (diff) | |
parent | 6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff) |
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/llwindow')
-rwxr-xr-x | indra/llwindow/CMakeLists.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt index ad010164eb..4c6e706119 100755 --- a/indra/llwindow/CMakeLists.txt +++ b/indra/llwindow/CMakeLists.txt @@ -165,7 +165,7 @@ if (BUILD_HEADLESS) set(llwindowheadless_HEADER_FILES llwindowmesaheadless.h llmousehandler.h - ) + ) add_library (llwindowheadless ${llwindow_SOURCE_FILES} ${llwindowheadless_SOURCE_FILES} @@ -180,12 +180,12 @@ if (llwindow_HEADER_FILES) list(APPEND llwindow_SOURCE_FILES ${llwindow_HEADER_FILES}) endif (llwindow_HEADER_FILES) -list(APPEND viewer_SOURCE_FILES ${viewer_HEADER_FILES}) + list(APPEND viewer_SOURCE_FILES ${viewer_HEADER_FILES}) -add_library (llwindow - ${llwindow_SOURCE_FILES} - ${viewer_SOURCE_FILES} - ) + add_library (llwindow + ${llwindow_SOURCE_FILES} + ${viewer_SOURCE_FILES} + ) if (SDL_FOUND) set_property(TARGET llwindow @@ -193,5 +193,5 @@ if (SDL_FOUND) ) endif (SDL_FOUND) -target_link_libraries (llwindow ${llwindow_LINK_LIBRARIES}) + target_link_libraries (llwindow ${llwindow_LINK_LIBRARIES}) |