diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-06-17 16:50:35 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-06-17 16:50:35 -0400 |
| commit | 761bf254a4e72ec521ff1a52ac12f8594a350818 (patch) | |
| tree | c72f84bb4ac319c10299a35934b52a09a73a127d /indra/llwindow | |
| parent | a2fa9a2bc26bb67c0bb952d3295c380dcb853eb5 (diff) | |
| parent | 1e41b017e1713a35eb68190d279cf8d28791b6d2 (diff) | |
merge changes for 3.6.0-release
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}) |