Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libspatialite: bump dependencies #19111

Closed
wants to merge 5 commits into from
Closed

libspatialite: bump dependencies #19111

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1a1d730
bump dependencies
SpaceIm Aug 9, 2023
2b3b081
sqlite3 headers are exposed in public headers of libspatialite
SpaceIm Aug 10, 2023
bc9a2df
restore #include <sqlite3.h> in test package
SpaceIm Aug 10, 2023
8ef073d
link sqlite3 in test package since later directly depends on it
SpaceIm Aug 16, 2023
de6b942
Add zlib range
AbrilRBS Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions recipes/libspatialite/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,28 +85,29 @@ def layout(self):
basic_layout(self, src_folder="src")

def requirements(self):
self.requires("sqlite3/3.42.0")
# sqlite.h is included by spatialite/sqlite.h public header
self.requires("sqlite3/3.42.0", transitive_headers=True)
self.requires("zlib/1.2.13")
if self.options.with_proj:
self.requires("proj/9.1.1")
self.requires("proj/9.2.1")
if self.options.with_iconv:
self.requires("libiconv/1.17")
if self.options.with_freexl:
self.requires("freexl/1.0.6")
self.requires("freexl/2.0.0")
if self.options.with_geos:
self.requires("geos/3.11.1")
self.requires("geos/3.11.2")
if self.options.get_safe("with_rttopo"):
self.requires("librttopo/1.1.0")
if self.options.with_libxml2:
self.requires("libxml2/2.10.3")
self.requires("libxml2/2.11.4")
if self.options.with_minizip:
self.requires("minizip/1.2.13")

def build_requirements(self):
if not is_msvc(self):
self.tool_requires("libtool/2.4.7")
if not self.conf.get("tools.gnu:pkg_config", check_type=str):
self.tool_requires("pkgconf/1.9.3")
self.tool_requires("pkgconf/1.9.5")
if self._settings_build.os == "Windows":
self.win_bash = True
if not self.conf.get("tools.microsoft.bash:path", check_type=str):
Expand Down
3 changes: 2 additions & 1 deletion recipes/libspatialite/all/test_package/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.1)
project(test_package LANGUAGES C)

find_package(libspatialite REQUIRED CONFIG)
find_package(SQLite3 REQUIRED)

add_executable(${PROJECT_NAME} test_package.c)
target_link_libraries(${PROJECT_NAME} PRIVATE libspatialite::libspatialite)
target_link_libraries(${PROJECT_NAME} PRIVATE libspatialite::libspatialite SQLite::SQLite3)
1 change: 1 addition & 0 deletions recipes/libspatialite/all/test_package/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ def layout(self):

def requirements(self):
self.requires(self.tested_reference_str)
self.requires("sqlite3/3.42.0")

def build(self):
cmake = CMake(self)
Expand Down