From 5fd977cd3cea68191420a669a77726bea4e67b65 Mon Sep 17 00:00:00 2001 From: program-- Date: Mon, 10 Jul 2023 09:45:30 -0700 Subject: [PATCH] rev: rm sqlite3 cmake module in favor of built-in changes per https://github.com/NOAA-OWP/ngen/pull/522#discussion_r1258565667 --- CMakeLists.txt | 2 +- cmake/modules/FindSQLite3.cmake | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 cmake/modules/FindSQLite3.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ea53b7d41..cd6f9fa1dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -115,7 +115,7 @@ find_package(Boost 1.72.0 REQUIRED) find_package(SQLite3) -if(SQLITE3_LIBRARY AND SQLITE3_INCLUDE) +if(SQLite3_FOUND) set(NGEN_WITH_SQLITE3 ON) add_compile_definitions(NGEN_WITH_SQLITE3) else() diff --git a/cmake/modules/FindSQLite3.cmake b/cmake/modules/FindSQLite3.cmake deleted file mode 100644 index ffed8ef65e..0000000000 --- a/cmake/modules/FindSQLite3.cmake +++ /dev/null @@ -1,16 +0,0 @@ -message("Looking for SQLite3...") -find_path(SQLITE3_INCLUDE NAMES sqlite3.h) -mark_as_advanced(SQLITE3_INCLUDE) -if(SQLITE3_INCLUDE) - include_directories(${SQLITE3_INCLUDE}) -endif() - -find_library(SQLITE3_LIBRARY NAMES sqlite3) -mark_as_advanced(SQLITE3_LIBRARY) -if(SQLITE3_LIBRARY) - add_library(sqlite3 SHARED IMPORTED) - set_property(TARGET sqlite3 PROPERTY IMPORTED_LOCATION "${SQLITE3_LIBRARY}") -endif() - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(SQLite3 DEFAULT_MSG SQLITE3_LIBRARY SQLITE3_INCLUDE) \ No newline at end of file