diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-12-29 13:23:02 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-12-29 13:23:02 -0500 |
commit | 5f99331f4a9ed5ed78af7b47bdad152949e63ec4 (patch) | |
tree | 78aa91b7a1ac5f31a4e1de11f1a30d4b53561a05 /indra/cmake/LLPlugin.cmake | |
parent | ed365b9c0eea12fa30629be7d26605b77eeedc05 (diff) | |
parent | 087c105317058dc3a011c937a5aceaf87fdecc26 (diff) |
Automated merge up from viewer-development
Diffstat (limited to 'indra/cmake/LLPlugin.cmake')
-rw-r--r-- | indra/cmake/LLPlugin.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/cmake/LLPlugin.cmake b/indra/cmake/LLPlugin.cmake index 9722f16c3c..7ee404b9bd 100644 --- a/indra/cmake/LLPlugin.cmake +++ b/indra/cmake/LLPlugin.cmake @@ -5,4 +5,10 @@ set(LLPLUGIN_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llplugin ) -set(LLPLUGIN_LIBRARIES llplugin) +if (LINUX) + # In order to support using ld.gold on linux, we need to explicitely + # specify all libraries that llplugin uses. + set(LLPLUGIN_LIBRARIES llplugin pthread) +else (LINUX) + set(LLPLUGIN_LIBRARIES llplugin) +endif (LINUX) |