diff options
author | Don Kjer <don@lindenlab.com> | 2011-01-07 10:48:38 -0800 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-01-07 10:48:38 -0800 |
commit | 829c2c86975dd80d13008c38246fa8ea0d10529c (patch) | |
tree | e90bda161771de9f3fcd98e2806e8eed7c4222fc /indra/cmake/BerkeleyDB.cmake | |
parent | a9bc51e6416dd637080c0307de99d5e09d06dcc4 (diff) | |
parent | c132d20a7433e2d09e3521a15497f661fcbd18b8 (diff) |
Merge from viewer-development
Diffstat (limited to 'indra/cmake/BerkeleyDB.cmake')
-rw-r--r-- | indra/cmake/BerkeleyDB.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/cmake/BerkeleyDB.cmake b/indra/cmake/BerkeleyDB.cmake index d98e79179d..e3ca0fd77d 100644 --- a/indra/cmake/BerkeleyDB.cmake +++ b/indra/cmake/BerkeleyDB.cmake @@ -6,6 +6,11 @@ set(DB_FIND_REQUIRED ON) if (STANDALONE) include(FindBerkeleyDB) else (STANDALONE) - set(DB_LIBRARIES db-4.2) + if (LINUX) + # Need to add dependency pthread explicitely to support ld.gold. + set(DB_LIBRARIES db-4.2 pthread) + else (LINUX) + set(DB_LIBRARIES db-4.2) + endif (LINUX) set(DB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) endif (STANDALONE) |