diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-04-04 10:42:52 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-04-04 10:42:52 -0400 |
| commit | 47781184fc50f6e9e0842c2d7fa7632038a279df (patch) | |
| tree | 83522faadf17895565c38d89064aff6da51a1006 /indra/cmake/BerkeleyDB.cmake | |
| parent | 0dd0758ab9114c53a274ff707d626c8fe5e7afb0 (diff) | |
| parent | 3c6a09372da395a621fb35db4934af2c7c21e910 (diff) | |
Automated merge up from viewer-development into mesh-development
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) |