diff options
Diffstat (limited to 'linden/indra/llui/CMakeLists.txt')
-rw-r--r-- | linden/indra/llui/CMakeLists.txt | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/linden/indra/llui/CMakeLists.txt b/linden/indra/llui/CMakeLists.txt index a0f80b4..e6b3b63 100644 --- a/linden/indra/llui/CMakeLists.txt +++ b/linden/indra/llui/CMakeLists.txt | |||
@@ -3,11 +3,9 @@ | |||
3 | project(llui) | 3 | project(llui) |
4 | 4 | ||
5 | include(00-Common) | 5 | include(00-Common) |
6 | include(LLAudio) | ||
7 | include(LLCommon) | 6 | include(LLCommon) |
8 | include(LLImage) | 7 | include(LLImage) |
9 | include(LLMath) | 8 | include(LLMath) |
10 | include(LLMedia) | ||
11 | include(LLMessage) | 9 | include(LLMessage) |
12 | include(LLRender) | 10 | include(LLRender) |
13 | include(LLWindow) | 11 | include(LLWindow) |
@@ -15,11 +13,9 @@ include(LLVFS) | |||
15 | include(LLXML) | 13 | include(LLXML) |
16 | 14 | ||
17 | include_directories( | 15 | include_directories( |
18 | ${LLAUDIO_INCLUDE_DIRS} | ||
19 | ${LLCOMMON_INCLUDE_DIRS} | 16 | ${LLCOMMON_INCLUDE_DIRS} |
20 | ${LLIMAGE_INCLUDE_DIRS} | 17 | ${LLIMAGE_INCLUDE_DIRS} |
21 | ${LLMATH_INCLUDE_DIRS} | 18 | ${LLMATH_INCLUDE_DIRS} |
22 | ${LLMEDIA_INCLUDE_DIRS} | ||
23 | ${LLMESSAGE_INCLUDE_DIRS} | 19 | ${LLMESSAGE_INCLUDE_DIRS} |
24 | ${LLRENDER_INCLUDE_DIRS} | 20 | ${LLRENDER_INCLUDE_DIRS} |
25 | ${LLWINDOW_INCLUDE_DIRS} | 21 | ${LLWINDOW_INCLUDE_DIRS} |
@@ -141,3 +137,14 @@ set_source_files_properties(${llui_HEADER_FILES} | |||
141 | list(APPEND llui_SOURCE_FILES ${llui_HEADER_FILES}) | 137 | list(APPEND llui_SOURCE_FILES ${llui_HEADER_FILES}) |
142 | 138 | ||
143 | add_library (llui ${llui_SOURCE_FILES}) | 139 | add_library (llui ${llui_SOURCE_FILES}) |
140 | # Libraries on which this library depends, needed for Linux builds | ||
141 | # Sort by high-level to low-level | ||
142 | target_link_libraries(llui | ||
143 | llrender | ||
144 | llwindow | ||
145 | llimage | ||
146 | llvfs # ugh, just for LLDir | ||
147 | llxml | ||
148 | llcommon # must be after llimage, llwindow, llrender | ||
149 | llmath | ||
150 | ) | ||