You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by sz...@apache.org on 2024/02/22 14:16:45 UTC

(nifi-minifi-cpp) 03/04: MINIFICPP-2301 SQLITE_ROOT should take precedence

This is an automated email from the ASF dual-hosted git repository.

szaszm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git

commit 9e0f9fe7aba9b2751b09a3747e19ce67c67281fc
Author: Adam Debreceni <ad...@apache.org>
AuthorDate: Thu Feb 22 14:06:25 2024 +0100

    MINIFICPP-2301 SQLITE_ROOT should take precedence
    
    Closes #1729
    
    Signed-off-by: Marton Szasz <sz...@apache.org>
---
 extensions/sql/CMakeLists.txt      |  3 +++
 thirdparty/soci/sqlite3-path.patch | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/extensions/sql/CMakeLists.txt b/extensions/sql/CMakeLists.txt
index 0643adb90..d998369f9 100644
--- a/extensions/sql/CMakeLists.txt
+++ b/extensions/sql/CMakeLists.txt
@@ -131,6 +131,8 @@ if(NOT WIN32)
         "-DEXPORTED_IODBC_LIBRARIES=${EXPORTED_IODBC_LIBRARIES}")
 endif()
 
+set(PC "${Patch_EXECUTABLE}" -p1 -i "${CMAKE_SOURCE_DIR}/thirdparty/soci/sqlite3-path.patch")
+
 # Build project
 ExternalProject_Add(
     soci-external
@@ -138,6 +140,7 @@ ExternalProject_Add(
     URL_HASH "SHA256=fa69347b1a1ef74450c0382b665a67bd6777cc7005bbe09726479625bcf1e29c"
     SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/thirdparty/soci-src"
     CMAKE_ARGS ${SOCI_CMAKE_ARGS}
+    PATCH_COMMAND ${PC}
     BUILD_BYPRODUCTS ${SOCI_LIBRARIES_LIST}
     EXCLUDE_FROM_ALL TRUE
 )
diff --git a/thirdparty/soci/sqlite3-path.patch b/thirdparty/soci/sqlite3-path.patch
new file mode 100644
index 000000000..13d8e38e0
--- /dev/null
+++ b/thirdparty/soci/sqlite3-path.patch
@@ -0,0 +1,36 @@
+diff -rupN orig/cmake/modules/FindSQLite3.cmake patched/cmake/modules/FindSQLite3.cmake
+--- orig/cmake/modules/FindSQLite3.cmake	2020-10-19 16:59:47
++++ patched/cmake/modules/FindSQLite3.cmake	2024-02-14 13:05:00
+@@ -17,6 +17,8 @@ find_path(SQLITE3_INCLUDE_DIR
+ find_path(SQLITE3_INCLUDE_DIR
+   NAMES sqlite3.h
+   PATH_PREFIXES sqlite sqlite3
++  HINTS
++  $ENV{SQLITE_ROOT}/include
+   PATHS
+   /usr/include
+   /usr/local/include
+@@ -27,13 +29,14 @@ find_path(SQLITE3_INCLUDE_DIR
+   $ENV{ProgramFiles}/SQLite3/*/include
+   $ENV{SystemDrive}/SQLite/*/include
+   $ENV{SystemDrive}/SQLite3/*/include
+-  $ENV{SQLITE_ROOT}/include
+   ${SQLITE_ROOT_DIR}/include
+   $ENV{OSGEO4W_ROOT}/include)
+ 
+ set(SQLITE3_NAMES sqlite3_i sqlite3)
+ find_library(SQLITE3_LIBRARY
+   NAMES ${SQLITE3_NAMES}
++  HINTS
++  $ENV{SQLITE_ROOT}/lib
+   PATHS
+   /usr/lib
+   /usr/local/lib
+@@ -42,7 +45,6 @@ find_library(SQLITE3_LIBRARY
+   $ENV{ProgramFiles}/SQLite3/*/lib
+   $ENV{SystemDrive}/SQLite/*/lib
+   $ENV{SystemDrive}/SQLite3/*/lib
+-  $ENV{SQLITE_ROOT}/lib
+   ${SQLITE_ROOT_DIR}/lib
+   $ENV{OSGEO4W_ROOT}/lib)
+