diff options
author | Oz Linden <oz@lindenlab.com> | 2011-04-06 07:32:56 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-04-06 07:32:56 -0400 |
commit | f41cbc0ac85ae328f2701aab23e94c0ef7ab5758 (patch) | |
tree | c0593e4d79918dc10173de5d3dfbb34e8c2ed40e /indra/cmake/BerkeleyDB.cmake | |
parent | 85c97c19347c1409f8f7231940b0b8f3a57fc0a5 (diff) | |
parent | b5c834c6fdcee7d7238bebfc561ecee3ecca3589 (diff) |
merge changes for storm-1094
Diffstat (limited to 'indra/cmake/BerkeleyDB.cmake')
-rw-r--r-- | indra/cmake/BerkeleyDB.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/cmake/BerkeleyDB.cmake b/indra/cmake/BerkeleyDB.cmake index e3ca0fd77d..57b53f46ff 100644 --- a/indra/cmake/BerkeleyDB.cmake +++ b/indra/cmake/BerkeleyDB.cmake @@ -8,7 +8,8 @@ if (STANDALONE) else (STANDALONE) if (LINUX) # Need to add dependency pthread explicitely to support ld.gold. - set(DB_LIBRARIES db-4.2 pthread) + use_prebuilt_binary(db) + set(DB_LIBRARIES db-5.1 pthread) else (LINUX) set(DB_LIBRARIES db-4.2) endif (LINUX) |