projects / ceph.git / blame
| Commit | Line | Data |
|---|---|---|
| 1e59de90 TL |
1 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 2 | index 7d736d129..2be8f8be9 100644 | |
| 3 | --- a/CMakeLists.txt | |
| 4 | +++ b/CMakeLists.txt | |
| 5 | @@ -129,7 +129,22 @@ if(NOT EXE_SQLITE3) | |
| 6 | message(SEND_ERROR "sqlite3 binary not found!") | |
| 7 | endif() | |
| 8 | ||
| 9 | -find_package(Sqlite3 REQUIRED) | |
| 10 | +find_package(unofficial-sqlite3 CONFIG REQUIRED) | |
| 11 | +if(unofficial-sqlite3_FOUND) | |
| 12 | + set(SQLITE3_FOUND true) | |
| 13 | + get_target_property(SQLITE3_INCLUDE_DIR unofficial::sqlite3::sqlite3 INTERFACE_INCLUDE_DIRECTORIES) | |
| 14 | + set(SQLITE3_LIBRARY unofficial::sqlite3::sqlite3) | |
| 15 | + # Extract version information from the header file | |
| 16 | + if(SQLITE3_INCLUDE_DIR) | |
| 17 | + file(STRINGS ${SQLITE3_INCLUDE_DIR}/sqlite3.h _ver_line | |
| 18 | + REGEX "^#define SQLITE_VERSION *\"[0-9]+\\.[0-9]+\\.[0-9]+\"" | |
| 19 | + LIMIT_COUNT 1) | |
| 20 | + string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" | |
| 21 | + SQLITE3_VERSION "${_ver_line}") | |
| 22 | + unset(_ver_line) | |
| 23 | + endif() | |
| 24 | +endif() | |
| 25 | + | |
| 26 | if(NOT SQLITE3_FOUND) | |
| 27 | message(SEND_ERROR "sqlite3 dependency not found!") | |
| 28 | endif() | |
| 29 | @@ -171,6 +186,7 @@ if(ENABLE_CURL) | |
| 30 | find_package(CURL REQUIRED) | |
| 31 | if(CURL_FOUND) | |
| 32 | set(CURL_ENABLED TRUE) | |
| 33 | + set(CURL_LIBRARY CURL::libcurl) | |
| 34 | else() | |
| 35 | message(SEND_ERROR "curl dependency not found!") | |
| 36 | endif() | |
| 37 | ||
| 38 | diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt | |
| 39 | index c790fa4a8..6653a28b9 100644 | |
| 40 | --- a/cmake/CMakeLists.txt | |
| 41 | +++ b/cmake/CMakeLists.txt | |
| 42 | @@ -95,6 +95,10 @@ endif () | |
| 43 | ||
| 44 | foreach (PROJECT_VARIANT_NAME ${PROJECT_NAME} ${PROJECT_LEGACY_NAME}) | |
| 45 | string (TOLOWER "${PROJECT_VARIANT_NAME}" PROJECT_VARIANT_LOWER) | |
| 46 | + set(FIND_DEPENDENCY_SQLITE3 "find_dependency(unofficial-sqlite3 CONFIG)") | |
| 47 | + if(CURL_ENABLED) | |
| 48 | + set(FIND_DEPENDENCY_CURL "find_dependency(CURL CONFIG)") | |
| 49 | + endif() | |
| 50 | set (CMAKECONFIGSUBDIR "${CMAKECONFIGDIR}/${PROJECT_VARIANT_LOWER}") | |
| 51 | # proj-config.cmake for the install tree. It's installed in | |
| 52 | # ${CMAKECONFIGSUBDIR} and @PROJECT_ROOT_DIR@ is the relative | |
| 53 | ||
| 54 | diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in | |
| 55 | index 23f997abd..8baef00f0 100644 | |
| 56 | --- a/cmake/project-config.cmake.in | |
| 57 | +++ b/cmake/project-config.cmake.in | |
| 58 | @@ -7,6 +7,10 @@ | |
| 59 | # @PROJECT_VARIANT_NAME@_LIBRARY_DIRS = /usr/local/lib | |
| 60 | # @PROJECT_VARIANT_NAME@_BINARY_DIRS = /usr/local/bin | |
| 61 | # @PROJECT_VARIANT_NAME@_VERSION = 4.9.1 (for example) | |
| 62 | +include(CMakeFindDependencyMacro) | |
| 63 | + | |
| 64 | +@FIND_DEPENDENCY_SQLITE3@ | |
| 65 | +@FIND_DEPENDENCY_CURL@ | |
| 66 | ||
| 67 | # Tell the user project where to find our headers and libraries | |
| 68 | get_filename_component (_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) |