diff --git a/cmake/find_scripts/FindSQLite.cmake b/cmake/find_scripts/FindSQLite.cmake deleted file mode 100644 index 19da96bf203..00000000000 --- a/cmake/find_scripts/FindSQLite.cmake +++ /dev/null @@ -1,9 +0,0 @@ -find_path(SQLITE_INCLUDE_DIR sqlite3.h) -find_library(SQLITE_LIBRARY NAMES sqlite3) - -mark_as_advanced(SQLITE_LIBRARY) -mark_as_advanced(SQLITE_INCLUDE_DIR) - -include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) -find_package_handle_standard_args(SQLite REQUIRED_VARS SQLITE_LIBRARY - SQLITE_INCLUDE_DIR) diff --git a/cmake/modules/CheckDependentLibraries.cmake b/cmake/modules/CheckDependentLibraries.cmake index b45b2b751ee..af9dfafc31d 100644 --- a/cmake/modules/CheckDependentLibraries.cmake +++ b/cmake/modules/CheckDependentLibraries.cmake @@ -106,14 +106,7 @@ endif() # Data storage options if(WITH_SQLITE) - find_package(SQLite REQUIRED) - if(SQLITE_FOUND) - add_library(SQLITE INTERFACE IMPORTED GLOBAL) - set_property(TARGET SQLITE PROPERTY INTERFACE_LINK_LIBRARIES - ${SQLITE_LIBRARY}) - set_property(TARGET SQLITE PROPERTY INTERFACE_INCLUDE_DIRECTORIES - ${SQLITE_INCLUDE_DIR}) - endif() + find_package(SQLite3 REQUIRED) endif() if(WITH_POSTGRES) @@ -328,7 +321,8 @@ check_target(ZLIB::ZLIB HAVE_ZLIB_H) check_target(Iconv::Iconv HAVE_ICONV_H) check_target(PNG::PNG HAVE_PNG_H) check_target(LIBJPEG HAVE_JPEGLIB_H) -check_target(SQLITE HAVE_SQLITE) +check_target(SQLite::SQLite3 HAVE_SQLITE) +check_target(SQLite::SQLite3 HAVE_SQLITE3_H) check_target(PostgreSQL::PostgreSQL HAVE_POSTGRES) check_target(PostgreSQL::PostgreSQL HAVE_LIBPQ_FE_H) check_target(MYSQL HAVE_MYSQL_H) diff --git a/db/drivers/CMakeLists.txt b/db/drivers/CMakeLists.txt index dc816bc412d..66b449d7fb8 100644 --- a/db/drivers/CMakeLists.txt +++ b/db/drivers/CMakeLists.txt @@ -105,13 +105,13 @@ build_program_in_subdir( DEFS "${grass_dbstubs_DEFS}" PRIMARY_DEPENDS - SQLITE + SQLite::SQLite3 HTML_FILE_NAME grass-sqlite RUNTIME_OUTPUT_DIR "${GRASS_INSTALL_DRIVERDIR}/db") -if(TARGET SQLITE) +if(TARGET SQLite::SQLite3) list(APPEND db_drivers sqlite) endif() diff --git a/general/CMakeLists.txt b/general/CMakeLists.txt index f143daf6aa3..6bd0859ce9b 100644 --- a/general/CMakeLists.txt +++ b/general/CMakeLists.txt @@ -46,7 +46,7 @@ build_program_in_subdir( GDAL::GDAL GEOS::geos_c PROJ - SQLITE + SQLite::SQLite3 DEFS "-DGRASS_VERSION_NUMBER=\"${GRASS_VERSION_NUMBER}\"" "-DGRASS_VERSION_GIT=\"${GRASS_VERSION_GIT}\"" diff --git a/include/config.h.cmake.in b/include/config.h.cmake.in index 2ea368ed813..8ac75a562c3 100644 --- a/include/config.h.cmake.in +++ b/include/config.h.cmake.in @@ -213,7 +213,7 @@ #cmakedefine HAVE_SQLITE3_H ${HAVE_SQLITE3_H} /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SQL_H ${HAVE_SQLITE3_H} +#cmakedefine HAVE_SQL_H ${HAVE_SQL_H} /* Define to 1 if you have the header file. */ #cmakedefine HAVE_STDINT_H ${HAVE_STDINT_H}