summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2015-12-17 17:12:11 -0800
committerRider Linden <rider@lindenlab.com>2015-12-17 17:12:11 -0800
commit4e8edebe13de9d638f1236bfd6aeddadf508de38 (patch)
tree3d0c89b9ee3864ff8c15482a57f1b98d88efbf0c
parent6851dd30cae7c748f4fc953de268f7989787501c (diff)
MAINT-5977: Update cmake file to always include boost with LLCommon
-rwxr-xr-xindra/cmake/LLCommon.cmake12
1 files changed, 10 insertions, 2 deletions
diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake
index b52556a73e..93b056fcb7 100755
--- a/indra/cmake/LLCommon.cmake
+++ b/indra/cmake/LLCommon.cmake
@@ -19,9 +19,17 @@ if (LINUX)
# In order to support using ld.gold on linux, we need to explicitely
# specify all libraries that llcommon uses.
# llcommon uses `clock_gettime' which is provided by librt on linux.
- set(LLCOMMON_LIBRARIES llcommon rt)
+ set(LLCOMMON_LIBRARIES llcommon rt
+ ${BOOST_COROUTINE_LIBRARY}
+ ${BOOST_CONTEXT_LIBRARY}
+ ${BOOST_THREAD_LIBRARY}
+ ${BOOST_SYSTEM_LIBRARY} )
else (LINUX)
- set(LLCOMMON_LIBRARIES llcommon)
+ set(LLCOMMON_LIBRARIES llcommon
+ ${BOOST_COROUTINE_LIBRARY}
+ ${BOOST_CONTEXT_LIBRARY}
+ ${BOOST_THREAD_LIBRARY}
+ ${BOOST_SYSTEM_LIBRARY} )
endif (LINUX)
# add_definitions(${TCMALLOC_FLAG})