diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-18 08:08:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-18 08:08:12 -0400 |
| commit | 7e3c32308c1f7d9e325fae55e7116b5fe3f460ca (patch) | |
| tree | fac07085cf1b416ef3fb240961913758ebf6b435 /indra/cmake/BerkeleyDB.cmake | |
| parent | f64a20ddcff91677b02b7688e08819cffb0989c9 (diff) | |
| parent | 28eaade69b4b330db7a9dfea528cc4f0a3998841 (diff) | |
merge out 2.6.0 changes from viewer-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) |