diff options
| author | Julian Andres Klode <jak@debian.org> | 2016-08-27 00:31:03 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2016-08-27 00:31:03 +0200 |
| commit | 6a68315e938eb2611806658828ecea86805822e7 (patch) | |
| tree | 5ff552cf0e6bac9a35bedaf544cb19332663fa70 /CMake/FindBerkeleyDB.cmake | |
| parent | 75d238ba66576c04f257e9d7c0a6995721f1441d (diff) | |
| parent | 01d207a5076b6fc37a064645b13f2c6550f58b94 (diff) | |
Merge branch 'portability/freebsd'
Diffstat (limited to 'CMake/FindBerkeleyDB.cmake')
| -rw-r--r-- | CMake/FindBerkeleyDB.cmake | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/CMake/FindBerkeleyDB.cmake b/CMake/FindBerkeleyDB.cmake index 44cfd3ddb..34bc3b0d1 100644 --- a/CMake/FindBerkeleyDB.cmake +++ b/CMake/FindBerkeleyDB.cmake @@ -33,14 +33,25 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# We need NO_DEFAULT_PATH here, otherwise CMake helpfully picks up the wrong +# db.h on BSD systems instead of the Berkeley DB one. find_path(BERKELEY_DB_INCLUDE_DIRS db.h - /usr/include/db5 + ${CMAKE_INSTALL_FULL_INCLUDEDIR}/db5 /usr/local/include/db5 - /usr/include/db4 + /usr/include/db5 + + ${CMAKE_INSTALL_FULL_INCLUDEDIR}/db4 /usr/local/include/db4 + /usr/include/db4 + + ${CMAKE_INSTALL_FULL_INCLUDEDIR} + /usr/local/include + /usr/include + + NO_DEFAULT_PATH ) -find_library(BERKELEY_DB_LIBRARIES NAMES db ) +find_library(BERKELEY_DB_LIBRARIES NAMES db db-5) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Berkeley "Could not find Berkeley DB >= 4.1" BERKELEY_DB_INCLUDE_DIRS BERKELEY_DB_LIBRARIES) |