diff options
| author | Don Kjer <don@lindenlab.com> | 2012-09-21 00:38:41 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-09-21 00:38:41 +0000 |
| commit | cda61df637e732a43389624c5a4a05536c9a5d46 (patch) | |
| tree | 7256eadb9b672760a4fae34eeffe8e9bb442d469 /indra | |
| parent | 948820bdea1c34a7bffa5d0ec6af563914e6f4f1 (diff) | |
| parent | c708fb892c7d934c917a2c868644e626f5a7da14 (diff) | |
Automerge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llrender/CMakeLists.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/llrender/CMakeLists.txt b/indra/llrender/CMakeLists.txt index 638ab23bd6..f31446924f 100644 --- a/indra/llrender/CMakeLists.txt +++ b/indra/llrender/CMakeLists.txt @@ -89,7 +89,6 @@ if ((SERVER OR BAKING) AND NOT WINDOWS AND NOT DARWIN) llrender ) - set_source_files_properties( ${server_SOURCE_FILES} PROPERTIES @@ -99,12 +98,8 @@ if ((SERVER OR BAKING) AND NOT WINDOWS AND NOT DARWIN) ${llrender_SOURCE_FILES} ${server_SOURCE_FILES} ) -endif ((SERVER OR BAKING) AND NOT WINDOWS AND NOT DARWIN) -add_library (llrender ${llrender_SOURCE_FILES}) -# Libraries on which this library depends, needed for Linux builds -# Sort by high-level to low-level -target_link_libraries(llrender +target_link_libraries(llrenderheadless ${LLCOMMON_LIBRARIES} ${LLIMAGE_LIBRARIES} ${LLMATH_LIBRARIES} @@ -113,10 +108,14 @@ target_link_libraries(llrender ${LLXML_LIBRARIES} ${LLVFS_LIBRARIES} ${LLWINDOW_LIBRARIES} - ${FREETYPE_LIBRARIES} ${OPENGL_LIBRARIES}) -target_link_libraries(llrenderheadless +endif ((SERVER OR BAKING) AND NOT WINDOWS AND NOT DARWIN) + +add_library (llrender ${llrender_SOURCE_FILES}) +# Libraries on which this library depends, needed for Linux builds +# Sort by high-level to low-level +target_link_libraries(llrender ${LLCOMMON_LIBRARIES} ${LLIMAGE_LIBRARIES} ${LLMATH_LIBRARIES} @@ -125,5 +124,6 @@ target_link_libraries(llrenderheadless ${LLXML_LIBRARIES} ${LLVFS_LIBRARIES} ${LLWINDOW_LIBRARIES} + ${FREETYPE_LIBRARIES} ${OPENGL_LIBRARIES}) |