use sqlite3 config, make sqlite3 private (#12875)

4 files changed, 62 insertions, 3 deletions

diff --git a/ports/proj4/CONTROL b/ports/proj4/CONTROL
index 523e449a1..ef83912c6 100644
--- a/ports/proj4/CONTROL
+++ b/ports/proj4/CONTROL
@@ -1,5 +1,6 @@
 Source: proj4
-Version: 6.3.1-1
+Version: 6.3.1
+Port-Version: 2
 Homepage: https://github.com/OSGeo/PROJ
 Description: PROJ.4 library for cartographic projections
 Build-Depends: sqlite3[core]
@@ -7,4 +8,4 @@ Default-Features: database
 
 Feature: database
 Build-Depends: sqlite3[tool] (!uwp&!arm)
-Description: generate database
\ No newline at end of file
+Description: generate database
diff --git a/ports/proj4/fix-sqlite-dependency-export.patch b/ports/proj4/fix-sqlite-dependency-export.patch
index 774d1acfd..06ea71c79 100644
--- a/ports/proj4/fix-sqlite-dependency-export.patch
+++ b/ports/proj4/fix-sqlite-dependency-export.patch
@@ -7,7 +7,7 @@ index 2e90f98f..dc171e91 100644
  
  include_directories(${SQLITE3_INCLUDE_DIR})
 -target_link_libraries(${PROJ_CORE_TARGET} ${SQLITE3_LIBRARY})
-+target_link_libraries(${PROJ_CORE_TARGET} PUBLIC ${SQLITE3_LIBRARY})
++target_link_libraries(${PROJ_CORE_TARGET} PRIVATE ${SQLITE3_LIBRARY})
  
  if(MSVC AND BUILD_LIBPROJ_SHARED)
    target_compile_definitions(${PROJ_CORE_TARGET}
diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake
index be633ef0c..b669bfd72 100644
--- a/ports/proj4/portfile.cmake
+++ b/ports/proj4/portfile.cmake
@@ -11,6 +11,7 @@ vcpkg_from_github(
         fix-win-output-name.patch
         fix-sqlite-dependency-export.patch
         fix-linux-build.patch
+        use-sqlite3-config.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
diff --git a/ports/proj4/use-sqlite3-config.patch b/ports/proj4/use-sqlite3-config.patch
new file mode 100644
index 000000000..050a88415
--- /dev/null
+++ b/ports/proj4/use-sqlite3-config.patch
@@ -0,0 +1,57 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c617912..bed0428 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -122,7 +122,23 @@ if(NOT EXE_SQLITE3)
+   message(SEND_ERROR "sqlite3 binary not found!")
+ endif()
+ 
+-find_package(Sqlite3 REQUIRED)
++#find_package(Sqlite3 REQUIRED)
++find_package(unofficial-sqlite3 CONFIG REQUIRED)
++if(unofficial-sqlite3_FOUND)
++  set(SQLITE3_FOUND true)
++  get_target_property(SQLITE3_INCLUDE_DIR unofficial::sqlite3::sqlite3 INTERFACE_INCLUDE_DIRECTORIES)
++  set(SQLITE3_LIBRARY unofficial::sqlite3::sqlite3)
++  # 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()
++endif()
++
+ if(NOT SQLITE3_FOUND)
+   message(SEND_ERROR "sqlite3 dependency not found!")
+ endif()
+diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
+index 92197c8..ab65de7 100644
+--- a/cmake/CMakeLists.txt
++++ b/cmake/CMakeLists.txt
+@@ -25,6 +25,10 @@ else ()
+ endif ()
+ 
+ string(TOLOWER "${PROJECT_NAME}" PROJECT_NAME_LOWER)
++set(FIND_DEPENDENCY_SQLITE3 "")
++if(NOT BUILD_LIBPROJ_SHARED)
++	set(FIND_DEPENDENCY_SQLITE3 "find_package(unofficial-sqlite3 CONFIG REQUIRED)")
++endif()
+ configure_file(project-config.cmake.in project-config.cmake @ONLY)
+ configure_file(project-config-version.cmake.in
+   project-config-version.cmake @ONLY)
+diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in
+index 9a52b3b..295d95d 100644
+--- a/cmake/project-config.cmake.in
++++ b/cmake/project-config.cmake.in
+@@ -13,6 +13,8 @@ message (STATUS "Reading ${CMAKE_CURRENT_LIST_FILE}")
+ message (STATUS
+   "@PROJECT_NAME@ configuration, version ${@PROJECT_NAME@_VERSION}")
+ 
++@FIND_DEPENDENCY_SQLITE3@
++
+ # Tell the user project where to find our headers and libraries
+ get_filename_component (_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
+ get_filename_component (_ROOT "${_DIR}/@PROJECT_ROOT_DIR@" ABSOLUTE)