Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

Fix libspatialite link libraries [skip actions]

This commit is contained in:
Kai Pastor 2022-06-28 09:01:28 +02:00
parent 2ddd8c1b56
commit 5c4f5122b0
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ports/gdal/find-spatialite.patch Normal file
View File

@ -0,0 +1,23 @@
diff --git a/cmake/modules/packages/FindSPATIALITE.cmake b/cmake/modules/packages/FindSPATIALITE.cmake
index 00612b0..6388719 100644
--- a/cmake/modules/packages/FindSPATIALITE.cmake
+++ b/cmake/modules/packages/FindSPATIALITE.cmake
@@ -38,9 +38,17 @@ endif()
find_package(PkgConfig QUIET)
if(PKG_CONFIG_FOUND)
- pkg_check_modules(PC_SPATIALITE QUIET spatialite)
+ pkg_check_modules(PC_SPATIALITE QUIET IMPORTED_TARGET spatialite)
set(SPATIALITE_VERSION_STRING ${PC_SPATIALITE_VERSION})
endif()
+if(PC_SPATIALITE_FOUND)
+ set(SPATIALITE_INCLUDE_DIR "${PC_SPATIALITE_INCLUDE_DIRS}" CACHE STRING "")
+ set(SPATIALITE_LIBRARY "${PC_SPATIALITE_LIBRARIES}" CACHE STRING "")
+ if(NOT TARGET SPATIALITE::SPATIALITE)
+ add_library(SPATIALITE::SPATIALITE INTERFACE IMPORTED)
+ set_target_properties(SPATIALITE::SPATIALITE PROPERTIES INTERFACE_LINK_LIBRARIES PkgConfig::PC_SPATIALITE)
+ endif()
+endif()
find_path(SPATIALITE_INCLUDE_DIR
NAMES spatialite.h

2
ports/gdal/portfile.cmake
View File

@ -4,6 +4,8 @@ vcpkg_from_github(
REF v3.5.1RC1 REF v3.5.1RC1
SHA512 d9d12bb8da5e073c22a3f6ca40d8bf8583eb2ae538f636fe3852133b2aaf4467099f9db793b442a76200770b4faf5491210bf8e1d854129386b4d8455f9018a5 SHA512 d9d12bb8da5e073c22a3f6ca40d8bf8583eb2ae538f636fe3852133b2aaf4467099f9db793b442a76200770b4faf5491210bf8e1d854129386b4d8455f9018a5
HEAD_REF master HEAD_REF master
PATCHES
find-spatialite.patch
) )
# `vcpkg clean` stumbles over one subdir # `vcpkg clean` stumbles over one subdir
file(REMOVE_RECURSE "${SOURCE_PATH}/autotest") file(REMOVE_RECURSE "${SOURCE_PATH}/autotest")