diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2012-05-07 15:16:31 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2012-05-07 15:16:31 -0400 |
| commit | 74d59e7128bb02a4b49af99e44f437a736a3f62b (patch) | |
| tree | 5a5b750b47a55e8a378a871eb278d0bb8425b5c4 /indra/cmake/LLCoreHttp.cmake | |
| parent | 438a6431e418eac5a3a4e00f7adfe379994869d7 (diff) | |
Build llcorehttp as part of a viewer dependency with unit tests. This required
boost::thread and the easiest path to that was to go with the 1.48 Boost release
in the 3P tree (eliminating a fork for a modified 1.45 packaging). One unit test,
the most important one, is failing in test_httprequest but that can be attended
to later. This test issues a GET to http://localhost:2/ and that is hitting the
wire but the libcurl plumbing isn't delivering the failure, only the eventual
timeout. An unexpected change in behavior.
Diffstat (limited to 'indra/cmake/LLCoreHttp.cmake')
| -rw-r--r-- | indra/cmake/LLCoreHttp.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/cmake/LLCoreHttp.cmake b/indra/cmake/LLCoreHttp.cmake index 280189da3d..61e4b23d98 100644 --- a/indra/cmake/LLCoreHttp.cmake +++ b/indra/cmake/LLCoreHttp.cmake @@ -3,12 +3,14 @@ include(CARes) include(CURL) include(OpenSSL) +include(Boost) set(LLCOREHTTP_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llcorehttp ${CARES_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIRS} + ${BOOST_INCLUDE_DIRS} ) set(LLCOREHTTP_LIBRARIES llcorehttp) |