From 239e072bfcf97b8a12c18ff9974fd0a2929c9ee4 Mon Sep 17 00:00:00 2001
From: Monty Brandenberg <monty@lindenlab.com>
Date: Tue, 8 May 2012 12:27:24 -0400
Subject: Unit test still giving me issues on the local windows system.  Seems
 to be a hard stall while allocating the first easy handle in a descent of the
 global initiailization code but that doesn't seem to be a problem on TC
 machines.  Perhaps the static linking is creating multiple data copies.  More
 work needed.

---
 indra/cmake/Boost.cmake           | 20 +++++++++++++++-----
 indra/llcorehttp/CMakeLists.txt   |  8 +++++++-
 indra/llcorehttp/_httplibcurl.h   |  1 +
 indra/llcorehttp/_httpoprequest.h |  2 ++
 indra/llcorehttp/httpcommon.h     |  2 +-
 5 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 4a797d968a..2af0bc1b30 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -54,11 +54,21 @@ else (STANDALONE)
           debug libboost_thread-mt-gd)
     endif (MSVC80)
   elseif (LINUX)
-    set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
-    set(BOOST_REGEX_LIBRARY boost_regex-mt)
-    set(BOOST_SYSTEM_LIBRARY boost_system-mt)
-    set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
-    set(BOOST_THREAD_LIBRARY boost_thread-mt)
+    set(BOOST_PROGRAM_OPTIONS_LIBRARY
+        optimized boost_program_options-mt
+        debug boost_program_options-mt-d)
+    set(BOOST_REGEX_LIBRARY
+        optimized boost_regex-mt
+        debug boost_regex-mt-d)
+    set(BOOST_SYSTEM_LIBRARY
+        optimized boost_system-mt
+        debug boost_system-mt-d)
+    set(BOOST_FILESYSTEM_LIBRARY
+        optimized boost_filesystem-mt
+        debug boost_filesystem-mt-d)
+    set(BOOST_THREAD_LIBRARY
+        optimized boost_thread-mt
+        debug boost_thread-mt-d)
   elseif (DARWIN)
     set(BOOST_PROGRAM_OPTIONS_LIBRARY
         optimized boost_program_options-mt
diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt
index 99b60a5995..81c502b642 100644
--- a/indra/llcorehttp/CMakeLists.txt
+++ b/indra/llcorehttp/CMakeLists.txt
@@ -3,8 +3,12 @@
 project(llcorehttp)
 
 include(00-Common)
-include(LLCoreHttp)
 include(GoogleMock)
+include(CURL)
+include(CARes)
+include(OpenSSL)
+include(ZLIB)
+include(LLCoreHttp)
 include(LLAddBuildTest)
 include(LLCommon)
 include(Tut)
@@ -106,8 +110,10 @@ if (LL_TESTS)
       ${LLCOMMON_LIBRARIES}
       ${GOOGLEMOCK_LIBRARIES}
       ${CURL_LIBRARIES}
+      ${CARES_LIBRARIES}
       ${OPENSSL_LIBRARIES}
       ${CRYPTO_LIBRARIES}
+      ${BOOST_THREAD_LIBRARY}
       )
 
   LL_ADD_INTEGRATION_TEST(llcorehttp
diff --git a/indra/llcorehttp/_httplibcurl.h b/indra/llcorehttp/_httplibcurl.h
index 5ba244cee4..01c68320af 100644
--- a/indra/llcorehttp/_httplibcurl.h
+++ b/indra/llcorehttp/_httplibcurl.h
@@ -27,6 +27,7 @@
 #ifndef	_LLCORE_HTTP_LIBCURL_H_
 #define	_LLCORE_HTTP_LIBCURL_H_
 
+#include "linden_common.h"		// Modifies curl/curl.h interfaces
 
 #include <curl/curl.h>
 #include <curl/multi.h>
diff --git a/indra/llcorehttp/_httpoprequest.h b/indra/llcorehttp/_httpoprequest.h
index e912851aed..232ee841d6 100644
--- a/indra/llcorehttp/_httpoprequest.h
+++ b/indra/llcorehttp/_httpoprequest.h
@@ -28,6 +28,8 @@
 #define	_LLCORE_HTTP_OPREQUEST_H_
 
 
+#include "linden_common.h"		// Modifies curl/curl.h interfaces
+
 #include "httpcommon.h"
 
 #include <curl/curl.h>
diff --git a/indra/llcorehttp/httpcommon.h b/indra/llcorehttp/httpcommon.h
index 5fc497e720..9de5769d57 100644
--- a/indra/llcorehttp/httpcommon.h
+++ b/indra/llcorehttp/httpcommon.h
@@ -93,7 +93,7 @@
 /// <TBD>
 ///
 
-#include "linden_common.h"
+#include "linden_common.h"		// Modifies curl/curl.h interfaces
 
 #include <string>
 
-- 
cgit v1.2.3