ソースを参照

cmake: Fix FindBerkeleyDB to correct lib name.

- CMake lint
- Search only C version
Xenofon Karamanos 7 ヶ月 前
コミット
13d306dd97
1 ファイル変更19 行追加49 行削除
  1. 19 49
      cmake/modules/FindBerkeleyDB.cmake

+ 19 - 49
cmake/modules/FindBerkeleyDB.cmake

@@ -38,8 +38,7 @@ if(CMAKE_HOST_APPLE)
     execute_process(
       COMMAND ${HOMEBREW_EXECUTABLE} --prefix [email protected]
       OUTPUT_VARIABLE _BerkeleyDB_homebrew_prefix
-      ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
+      ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
   endif()
 endif()
 
@@ -56,8 +55,7 @@ find_path(
     5.3
     db5.3
     5
-    db5
-)
+    db5)
 mark_as_advanced(BerkeleyDB_INCLUDE_DIR)
 unset(_BerkeleyDB_homebrew_prefix)
 
@@ -70,38 +68,21 @@ if(NOT BerkeleyDB_LIBRARY)
     set(CMAKE_FIND_USE_CMAKE_PATH FALSE)
   endif()
 
-  get_filename_component(
-    _BerkeleyDB_lib_hint "${BerkeleyDB_INCLUDE_DIR}" DIRECTORY
-  )
+  get_filename_component(_BerkeleyDB_lib_hint "${BerkeleyDB_INCLUDE_DIR}"
+                         DIRECTORY)
 
   find_library(
     BerkeleyDB_LIBRARY_RELEASE
-    NAMES db_cxx-4.8
-          db4_cxx
-          db48
-          db_cxx-5.3
-          db_cxx-5
-          db_cxx
-          libdb48
-          NAMES_PER_DIR
+    NAMES db48 db53 db NAMES_PER_DIR
     HINTS ${_BerkeleyDB_lib_hint}
-    PATH_SUFFIXES lib
-  )
+    PATH_SUFFIXES lib)
   mark_as_advanced(BerkeleyDB_LIBRARY_RELEASE)
 
   find_library(
     BerkeleyDB_LIBRARY_DEBUG
-    NAMES db_cxx-4.8
-          db4_cxx
-          db48
-          db_cxx-5.3
-          db_cxx-5
-          db_cxx
-          libdb48
-          NAMES_PER_DIR
+    NAMES db48 db53 db NAMES_PER_DIR
     HINTS ${_BerkeleyDB_lib_hint}
-    PATH_SUFFIXES debug/lib
-  )
+    PATH_SUFFIXES debug/lib)
   mark_as_advanced(BerkeleyDB_LIBRARY_DEBUG)
 
   unset(_BerkeleyDB_lib_hint)
@@ -116,28 +97,23 @@ endif()
 
 if(BerkeleyDB_INCLUDE_DIR)
   file(STRINGS "${BerkeleyDB_INCLUDE_DIR}/db.h" _BerkeleyDB_version_strings
-       REGEX "^#define[\t ]+DB_VERSION_(MAJOR|MINOR|PATCH)[ \t]+[0-9]+.*"
-  )
+       REGEX "^#define[\t ]+DB_VERSION_(MAJOR|MINOR|PATCH)[ \t]+[0-9]+.*")
   string(REGEX
          REPLACE ".*#define[\t ]+DB_VERSION_MAJOR[ \t]+([0-9]+).*" "\\1"
-                 _BerkeleyDB_version_major "${_BerkeleyDB_version_strings}"
-  )
+                 _BerkeleyDB_version_major "${_BerkeleyDB_version_strings}")
   string(REGEX
          REPLACE ".*#define[\t ]+DB_VERSION_MINOR[ \t]+([0-9]+).*" "\\1"
-                 _BerkeleyDB_version_minor "${_BerkeleyDB_version_strings}"
-  )
+                 _BerkeleyDB_version_minor "${_BerkeleyDB_version_strings}")
   string(REGEX
          REPLACE ".*#define[\t ]+DB_VERSION_PATCH[ \t]+([0-9]+).*" "\\1"
-                 _BerkeleyDB_version_patch "${_BerkeleyDB_version_strings}"
-  )
+                 _BerkeleyDB_version_patch "${_BerkeleyDB_version_strings}")
   unset(_BerkeleyDB_version_strings)
   # The MAJOR.MINOR.PATCH version will be logged in the following find_package_handle_standard_args() command.
   set(_BerkeleyDB_full_version
       ${_BerkeleyDB_version_major}.${_BerkeleyDB_version_minor}.${_BerkeleyDB_version_patch}
   )
   set(BerkeleyDB_VERSION
-      ${_BerkeleyDB_version_major}.${_BerkeleyDB_version_minor}
-  )
+      ${_BerkeleyDB_version_major}.${_BerkeleyDB_version_minor})
   unset(_BerkeleyDB_version_major)
   unset(_BerkeleyDB_version_minor)
   unset(_BerkeleyDB_version_patch)
@@ -147,36 +123,30 @@ include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
   BerkeleyDB
   REQUIRED_VARS BerkeleyDB_LIBRARY BerkeleyDB_INCLUDE_DIR
-  VERSION_VAR _BerkeleyDB_full_version
-)
+  VERSION_VAR _BerkeleyDB_full_version)
 unset(_BerkeleyDB_full_version)
 
 if(BerkeleyDB_FOUND AND NOT TARGET BerkeleyDB::BerkeleyDB)
   add_library(BerkeleyDB::BerkeleyDB UNKNOWN IMPORTED)
   set_target_properties(
     BerkeleyDB::BerkeleyDB PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
-                                      "${BerkeleyDB_INCLUDE_DIR}"
-  )
+                                      "${BerkeleyDB_INCLUDE_DIR}")
   if(BerkeleyDB_LIBRARY_RELEASE)
     set_property(
       TARGET BerkeleyDB::BerkeleyDB
       APPEND
-      PROPERTY IMPORTED_CONFIGURATIONS RELEASE
-    )
+      PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
     set_target_properties(
       BerkeleyDB::BerkeleyDB PROPERTIES IMPORTED_LOCATION_RELEASE
-                                        "${BerkeleyDB_LIBRARY_RELEASE}"
-    )
+                                        "${BerkeleyDB_LIBRARY_RELEASE}")
   endif()
   if(BerkeleyDB_LIBRARY_DEBUG)
     set_property(
       TARGET BerkeleyDB::BerkeleyDB
       APPEND
-      PROPERTY IMPORTED_CONFIGURATIONS DEBUG
-    )
+      PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
     set_target_properties(
       BerkeleyDB::BerkeleyDB PROPERTIES IMPORTED_LOCATION_DEBUG
-                                        "${BerkeleyDB_LIBRARY_DEBUG}"
-    )
+                                        "${BerkeleyDB_LIBRARY_DEBUG}")
   endif()
 endif()