diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-08-17 16:08:44 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-08-17 16:08:44 -0700 |
| commit | 02b7e7ce07948a25bc1f58fdbfe3499dc917340f (patch) | |
| tree | d3a639fff1a80a97780b7b238aa22dcc0a3b7eaa | |
| parent | fc2e9ec3dbf9c936a733346f099371909a68ddd4 (diff) | |
Adding llcorehttp to links
| -rwxr-xr-x | indra/llprimitive/CMakeLists.txt | 1 | ||||
| -rwxr-xr-x | indra/llui/CMakeLists.txt | 3 | ||||
| -rwxr-xr-x | indra/newview/CMakeLists.txt | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt index d1475cf734..9684a3578a 100755 --- a/indra/llprimitive/CMakeLists.txt +++ b/indra/llprimitive/CMakeLists.txt @@ -70,6 +70,7 @@ target_link_libraries(llprimitive ${LLCOMMON_LIBRARIES} ${LLMATH_LIBRARIES} ${LLMESSAGE_LIBRARIES} + ${LLCOREHTTP_LIBRARIES} ${LLXML_LIBRARIES} ${LLPHYSICSEXTENSIONS_LIBRARIES} ) diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt index 52738aeb6f..282df98974 100755 --- a/indra/llui/CMakeLists.txt +++ b/indra/llui/CMakeLists.txt @@ -269,6 +269,7 @@ add_library (llui ${llui_SOURCE_FILES}) # Sort by high-level to low-level target_link_libraries(llui ${LLMESSAGE_LIBRARIES} + ${LLCOREHTTP_LIBRARIES} ${LLRENDER_LIBRARIES} ${LLWINDOW_LIBRARIES} ${LLIMAGE_LIBRARIES} @@ -289,6 +290,6 @@ if(LL_TESTS) ) LL_ADD_PROJECT_UNIT_TESTS(llui "${llui_TEST_SOURCE_FILES}") # INTEGRATION TESTS - set(test_libs llui llmessage llcommon ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES}) + set(test_libs llui llmessage llcorehttp llcommon ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES}) LL_ADD_INTEGRATION_TEST(llurlentry llurlentry.cpp "${test_libs}") endif(LL_TESTS) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 3a6a1d4d64..4099bff0c6 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2384,7 +2384,7 @@ if (LL_TESTS) "${test_libs}" ) - LL_ADD_INTEGRATION_TEST(llhttpretrypolicy "llhttpretrypolicy.cpp" "${test_libs}") +# LL_ADD_INTEGRATION_TEST(llhttpretrypolicy "llhttpretrypolicy.cpp" "${test_libs}") #ADD_VIEWER_BUILD_TEST(llmemoryview viewer) #ADD_VIEWER_BUILD_TEST(llagentaccess viewer) |