From eef327f18b90cb61ec1aa6f1a07d5ea17f60326d Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Tue, 19 Jan 2016 01:40:52 -0500 Subject: [PATCH] Remove BerkeleyDB --- indra/cmake/APR.cmake | 5 ---- indra/cmake/BerkeleyDB.cmake | 20 ------------- indra/cmake/CMakeLists.txt | 2 -- indra/cmake/FindBerkeleyDB.cmake | 50 -------------------------------- 4 files changed, 77 deletions(-) delete mode 100644 indra/cmake/BerkeleyDB.cmake delete mode 100644 indra/cmake/FindBerkeleyDB.cmake diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake index f43b3fda1..447470a15 100644 --- a/indra/cmake/APR.cmake +++ b/indra/cmake/APR.cmake @@ -1,4 +1,3 @@ -include(BerkeleyDB) include(Linking) include(Prebuilt) @@ -50,8 +49,4 @@ else (STANDALONE) set(APRICONV_LIBRARIES iconv) endif (WINDOWS) set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/apr-1) - - if (LINUX) - list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES}) - endif (LINUX) endif (STANDALONE) diff --git a/indra/cmake/BerkeleyDB.cmake b/indra/cmake/BerkeleyDB.cmake deleted file mode 100644 index 5b885c6a7..000000000 --- a/indra/cmake/BerkeleyDB.cmake +++ /dev/null @@ -1,20 +0,0 @@ -include(Prebuilt) - -set(DB_FIND_QUIETLY ON) -set(DB_FIND_REQUIRED ON) - -if (STANDALONE) - include(FindBerkeleyDB) -else (STANDALONE) - if (LINUX) - # Need to add dependency pthread explicitely to support ld.gold. - use_prebuilt_binary(db) - set(DB_LIBRARIES db-5.1 pthread) - else (LINUX) - set(DB_LIBRARIES db-4.2) - endif (LINUX) - set(DB_INCLUDE_DIRS - ${LIBS_PREBUILT_DIR}/include - ${LIBS_PREBUILT_LEGACY_DIR}/include - ) -endif (STANDALONE) diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt index 800e68ed2..18a58fcba 100644 --- a/indra/cmake/CMakeLists.txt +++ b/indra/cmake/CMakeLists.txt @@ -12,7 +12,6 @@ set(cmake_SOURCE_FILES APR.cmake Audio.cmake BasicPluginBase.cmake - BerkeleyDB.cmake Boost.cmake BuildVersion.cmake CARes.cmake @@ -30,7 +29,6 @@ set(cmake_SOURCE_FILES FMODSTUDIO.cmake FindAPR.cmake FindAutobuild.cmake - FindBerkeleyDB.cmake FindCARes.cmake FindColladadom.cmake FindGLOD.cmake diff --git a/indra/cmake/FindBerkeleyDB.cmake b/indra/cmake/FindBerkeleyDB.cmake deleted file mode 100644 index 2d633c74e..000000000 --- a/indra/cmake/FindBerkeleyDB.cmake +++ /dev/null @@ -1,50 +0,0 @@ -# -*- cmake -*- - -# - Find BerkeleyDB -# Find the BerkeleyDB includes and library -# This module defines -# DB_INCLUDE_DIR, where to find db.h, etc. -# DB_LIBRARIES, the libraries needed to use BerkeleyDB. -# DB_FOUND, If false, do not try to use BerkeleyDB. -# also defined, but not for general use are -# DB_LIBRARY, where to find the BerkeleyDB library. - -FIND_PATH(DB_INCLUDE_DIR db.h -/usr/local/include/db4 -/usr/local/include -/usr/include/db4 -/usr/include -) - -SET(DB_NAMES ${DB_NAMES} db) -FIND_LIBRARY(DB_LIBRARY - NAMES ${DB_NAMES} - PATHS /usr/lib /usr/local/lib - ) - -IF (DB_LIBRARY AND DB_INCLUDE_DIR) - SET(DB_LIBRARIES ${DB_LIBRARY}) - SET(DB_FOUND "YES") -ELSE (DB_LIBRARY AND DB_INCLUDE_DIR) - SET(DB_FOUND "NO") -ENDIF (DB_LIBRARY AND DB_INCLUDE_DIR) - - -IF (DB_FOUND) - IF (NOT DB_FIND_QUIETLY) - MESSAGE(STATUS "Found BerkeleyDB: ${DB_LIBRARIES}") - ENDIF (NOT DB_FIND_QUIETLY) -ELSE (DB_FOUND) - IF (DB_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find BerkeleyDB library") - ENDIF (DB_FIND_REQUIRED) -ENDIF (DB_FOUND) - -# Deprecated declarations. -SET (NATIVE_DB_INCLUDE_PATH ${DB_INCLUDE_DIR} ) -GET_FILENAME_COMPONENT (NATIVE_DB_LIB_PATH ${DB_LIBRARY} PATH) - -MARK_AS_ADVANCED( - DB_LIBRARY - DB_INCLUDE_DIR - )