From 54e2d2b000f36b35ab5ab53cf3aeee922e54fbe3 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 21 Feb 2013 01:13:24 -0500
Subject: MAINT-2389: Change viewer to Boost package without ucontext.h. In
autobuild.xml, specify today's build of the Boost package that includes the
Boost.Context library, and whose boost::dcoroutines library uses
Boost.Context exclusively instead of its previous context-switching
underpinnings (source of the ucontext.h dependency). Add
BOOST_CONTEXT_LIBRARY to Boost.cmake and Copy3rdPartyLibs.cmake. Link it with
the viewer and with the lllogin.cpp test executable. Track new Boost package
convention that our (early, unofficial) Boost.Coroutine library is now
accessed as boost/dcoroutine/etc.h and boost::dcoroutines::etc. Remove
#include <boost/coroutine/coroutine.hpp> from llviewerprecompiledheaders.h
and lllogin.cpp: old rule that Boost.Coroutine header must be #included
before anything else that might use ucontext.h is gone now that we no longer
depend on ucontext.h. In fact remove -D_XOPEN_SOURCE in 00-Common.cmake
because that was inserted specifically to work around a known problem with
the ucontext.h facilities.
---
indra/viewer_components/login/CMakeLists.txt | 5 +++++
indra/viewer_components/login/lllogin.cpp | 1 -
2 files changed, 5 insertions(+), 1 deletion(-)
(limited to 'indra/viewer_components')
diff --git a/indra/viewer_components/login/CMakeLists.txt b/indra/viewer_components/login/CMakeLists.txt
index 7720619df3..28b87bf663 100644
--- a/indra/viewer_components/login/CMakeLists.txt
+++ b/indra/viewer_components/login/CMakeLists.txt
@@ -46,6 +46,11 @@ if(LL_TESTS)
SET(lllogin_TEST_SOURCE_FILES
lllogin.cpp
)
+ set_source_files_properties(
+ lllogin.cpp
+ PROPERTIES
+ LL_TEST_ADDITIONAL_LIBRARIES "${BOOST_CONTEXT_LIBRARY}"
+ )
LL_ADD_PROJECT_UNIT_TESTS(lllogin "${lllogin_TEST_SOURCE_FILES}")
endif(LL_TESTS)
diff --git a/indra/viewer_components/login/lllogin.cpp b/indra/viewer_components/login/lllogin.cpp
index bdcb068200..3357ad812d 100644
--- a/indra/viewer_components/login/lllogin.cpp
+++ b/indra/viewer_components/login/lllogin.cpp
@@ -23,7 +23,6 @@
* $/LicenseInfo$
*/
-#include <boost/coroutine/coroutine.hpp>
#include "linden_common.h"
#include "llsd.h"
#include "llsdutil.h"
--
cgit v1.2.3