From f7579dd3696985a55a8e1e245d7abc307102a029 Mon Sep 17 00:00:00 2001 From: Camila Date: Mon, 20 Nov 2023 22:18:51 +0100 Subject: [PATCH] Use a new FindSQLite3 cmake module. Add find sqlite to the root CMakeLists.txt. Signed-off-by: Camila --- CMakeLists.txt | 1 + cmake/modules/FindSQLite3.cmake | 122 +++++++++++++++++--------------- src/csync/CMakeLists.txt | 9 +-- 3 files changed, 71 insertions(+), 61 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ba0195b57efd5..f285dc3896704 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -214,6 +214,7 @@ if(BUILD_CLIENT) find_package(OpenSSL 1.1 REQUIRED ) find_package(ZLIB REQUIRED) + find_package(SQLite3 3.9.0 REQUIRED) if(NOT WIN32 AND NOT APPLE) find_package(PkgConfig REQUIRED) diff --git a/cmake/modules/FindSQLite3.cmake b/cmake/modules/FindSQLite3.cmake index 3c9a7c960ecd8..f135c5d64a10e 100644 --- a/cmake/modules/FindSQLite3.cmake +++ b/cmake/modules/FindSQLite3.cmake @@ -1,60 +1,68 @@ -# - Try to find SQLite3 -# Once done this will define -# -# SQLITE3_FOUND - system has SQLite3 -# SQLITE3_INCLUDE_DIRS - the SQLite3 include directory -# SQLITE3_LIBRARIES - Link these to use SQLite3 -# SQLITE3_DEFINITIONS - Compiler switches required for using SQLite3 -# -# Copyright (c) 2009-2013 Andreas Schneider -# -# Redistribution and use is allowed according to the terms of the New -# BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -# - - -if (UNIX) - find_package(PkgConfig) - if (PKG_CONFIG_FOUND) - pkg_check_modules(_SQLITE3 sqlite3) - endif (PKG_CONFIG_FOUND) -endif (UNIX) - -find_path(SQLITE3_INCLUDE_DIR - NAMES - sqlite3.h - PATHS - ${_SQLITE3_INCLUDEDIR} - ${SQLITE3_INCLUDE_DIRS} -) - -find_library(SQLITE3_LIBRARY - NAMES - sqlite3 sqlite3-0 - PATHS - ${_SQLITE3_LIBDIR} - ${SQLITE3_LIBRARIES} -) - -set(SQLITE3_INCLUDE_DIRS - ${SQLITE3_INCLUDE_DIR} -) - -if (SQLITE3_LIBRARY) - set(SQLITE3_LIBRARIES - ${SQLITE3_LIBRARIES} - ${SQLITE3_LIBRARY} - ) -endif (SQLITE3_LIBRARY) - -if (SQLite3_FIND_VERSION AND _SQLITE3_VERSION) - set(SQLite3_VERSION _SQLITE3_VERSION) -endif (SQLite3_FIND_VERSION AND _SQLITE3_VERSION) +# Distributed under the OSI-approved BSD 3-Clause License. See accompanying +# file Copyright.txt or https://cmake.org/licensing for details. -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(SQLite3 DEFAULT_MSG SQLITE3_LIBRARIES SQLITE3_INCLUDE_DIRS) +#[=======================================================================[.rst: +FindSQLite3 +----------- + +.. versionadded:: 3.14 + +Find the SQLite libraries, v3 + +IMPORTED targets +^^^^^^^^^^^^^^^^ + +This module defines the following :prop_tgt:`IMPORTED` target: + +``SQLite::SQLite3`` + +Result variables +^^^^^^^^^^^^^^^^ -# show the SQLITE3_INCLUDE_DIRS and SQLITE3_LIBRARIES variables only in the advanced view -mark_as_advanced(SQLITE3_INCLUDE_DIRS SQLITE3_LIBRARIES) +This module will set the following variables if found: + +``SQLite3_INCLUDE_DIRS`` + where to find sqlite3.h, etc. +``SQLite3_LIBRARIES`` + the libraries to link against to use SQLite3. +``SQLite3_VERSION`` + version of the SQLite3 library found +``SQLite3_FOUND`` + TRUE if found + +#]=======================================================================] + +# Look for the necessary header +find_path(SQLite3_INCLUDE_DIR NAMES sqlite3.h) +mark_as_advanced(SQLite3_INCLUDE_DIR) + +# Look for the necessary library +find_library(SQLite3_LIBRARY NAMES sqlite3 sqlite) +mark_as_advanced(SQLite3_LIBRARY) + +# Extract version information from the header file +if(SQLite3_INCLUDE_DIR) + file(STRINGS ${SQLite3_INCLUDE_DIR}/sqlite3.h _ver_line + REGEX "^#define SQLITE_VERSION *\"[0-9]+\\.[0-9]+\\.[0-9]+\"" + LIMIT_COUNT 1) + string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" + SQLite3_VERSION "${_ver_line}") + unset(_ver_line) +endif() + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(SQLite3 + REQUIRED_VARS SQLite3_INCLUDE_DIR SQLite3_LIBRARY + VERSION_VAR SQLite3_VERSION) +# Create the imported target +if(SQLite3_FOUND) + set(SQLite3_INCLUDE_DIRS ${SQLite3_INCLUDE_DIR}) + set(SQLite3_LIBRARIES ${SQLite3_LIBRARY}) + if(NOT TARGET SQLite::SQLite3) + add_library(SQLite::SQLite3 UNKNOWN IMPORTED) + set_target_properties(SQLite::SQLite3 PROPERTIES + IMPORTED_LOCATION "${SQLite3_LIBRARY}" + INTERFACE_INCLUDE_DIRECTORIES "${SQLite3_INCLUDE_DIR}") + endif() +endif() diff --git a/src/csync/CMakeLists.txt b/src/csync/CMakeLists.txt index 4d74bbbf1977a..e37a9fa4ad0ab 100644 --- a/src/csync/CMakeLists.txt +++ b/src/csync/CMakeLists.txt @@ -19,8 +19,6 @@ include(DefineOptions.cmake) include(DefineInstallationPaths) -find_package(SQLite3 3.8.0 REQUIRED) - include(ConfigureChecks.cmake) include(../common/common.cmake) @@ -66,8 +64,8 @@ target_include_directories( PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/std ) -target_include_directories(nextcloud_csync PUBLIC ${SQLITE3_INCLUDE_DIR}) -target_link_libraries(nextcloud_csync PUBLIC ${SQLITE3_LIBRARIES}) +# target_include_directories(nextcloud_csync PUBLIC ${SQLITE3_INCLUDE_DIR}) +# target_link_libraries(nextcloud_csync PUBLIC ${SQLITE3_LIBRARIES}) generate_export_header(nextcloud_csync EXPORT_MACRO_NAME OCSYNC_EXPORT @@ -84,6 +82,9 @@ if(ZLIB_FOUND) target_link_libraries(nextcloud_csync PUBLIC ZLIB::ZLIB) endif(ZLIB_FOUND) +if(SQLite3_FOUND) + target_link_libraries(nextcloud_csync PRIVATE SQLite::SQLite3) +endif(SQLite3_FOUND) # For src/common/utility_mac.cpp if (APPLE)