diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-02-12 21:59:51 -0500 | 
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-02-12 21:59:51 -0500 | 
| commit | 6da3f0907cea3748adb6be9a7c393835109adf3b (patch) | |
| tree | 8a569f192a49913db7365c97548c1227a123127e /indra/linux_updater | |
| parent | 8804fa524c084edb9f49f4122e2c7330a80c79b5 (diff) | |
| parent | 90a1b67cc43792e1ca0047eaca51530aa14e134c (diff) | |
Automated merge with ssh://hg.lindenlab.com/nat/viewer-new-apr
Diffstat (limited to 'indra/linux_updater')
| -rw-r--r-- | indra/linux_updater/CMakeLists.txt | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/linux_updater/CMakeLists.txt b/indra/linux_updater/CMakeLists.txt index 00a78b2a8f..4377a6333c 100644 --- a/indra/linux_updater/CMakeLists.txt +++ b/indra/linux_updater/CMakeLists.txt @@ -10,14 +10,14 @@ include(UI)  include(LLCommon)  include(LLVFS)  include(LLXML) -include(LLXUIXML) +include(LLUI)  include(Linking)  include_directories(      ${LLCOMMON_INCLUDE_DIRS}      ${LLVFS_INCLUDE_DIRS}      ${LLXML_INCLUDE_DIRS} -    ${LLXUIXML_INCLUDE_DIRS} +    ${LLUI_INCLUDE_DIRS}      ${CURL_INCLUDE_DIRS}      ${CARES_INCLUDE_DIRS}      ${OPENSSL_INCLUDE_DIRS} @@ -42,7 +42,7 @@ target_link_libraries(linux-updater      ${CRYPTO_LIBRARIES}      ${UI_LIBRARIES}      ${LLXML_LIBRARIES} -    ${LLXUIXML_LIBRARIES} +    ${LLUI_LIBRARIES}      ${LLVFS_LIBRARIES}      ${LLCOMMON_LIBRARIES}      )  | 
