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

Jump to bottom

gdal: fix build when with_libdeflate=True or when with_cryptopp=True and cryptopp is shared, bump deps #18592

Closed
wants to merge 1 commit into from
Closed

gdal: fix build when with_libdeflate=True or when with_cryptopp=True and cryptopp is shared, bump deps #18592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions recipes/gdal/post_3.5.0/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ endif()

if (${GDAL_USE_CRYPTOPP})
find_package(cryptopp REQUIRED)
add_library(CRYPTOPP::CRYPTOPP ALIAS cryptopp::cryptopp-static)
add_library(CRYPTOPP::CRYPTOPP ALIAS ${TARGET_FOR_CRYPTOPP})
endif()

if (${GDAL_USE_DEFLATE})
find_package(libdeflate REQUIRED)
add_library(Deflate::Deflate ALIAS libdeflate::libdeflate)
add_library(Deflate::Deflate ALIAS ${TARGET_FOR_DEFLATE})
endif()

if (${GDAL_USE_LZ4})
Expand Down
34 changes: 17 additions & 17 deletions recipes/gdal/post_3.5.0/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,13 +172,13 @@ def requirements(self):
self.requires("cryptopp/8.7.0")

if self.options.with_curl:
self.requires("libcurl/7.85.0")
self.requires("libcurl/8.1.2")

if self.options.with_dds:
self.requires("crunch/cci.20190615")

if self.options.with_expat:
self.requires("expat/2.4.9")
self.requires("expat/2.5.0")

if self.options.with_exr:
self.requires("openexr/3.1.5")
Expand All @@ -188,7 +188,7 @@ def requirements(self):
self.requires("freexl/1.0.6")

if self.options.with_geos:
self.requires("geos/3.11.0")
self.requires("geos/3.11.2")

if self.options.with_gif:
self.requires("giflib/5.2.1")
Expand All @@ -208,13 +208,13 @@ def requirements(self):
if self.options.with_jpeg == "libjpeg":
self.requires("libjpeg/9e")
elif self.options.with_jpeg == "libjpeg-turbo":
self.requires("libjpeg-turbo/2.1.4")
self.requires("libjpeg-turbo/2.1.5")

if self.options.with_kea:
self.requires("kealib/1.4.14")

if self.options.with_libdeflate:
self.requires("libdeflate/1.12")
self.requires("libdeflate/1.18")

if self.options.with_libiconv:
self.requires("libiconv/1.17")
Expand All @@ -223,7 +223,7 @@ def requirements(self):
self.requires("libkml/1.3.0")

if self.options.with_libtiff:
self.requires("libtiff/4.4.0")
self.requires("libtiff/4.5.0")

if self.options.with_lz4:
self.requires("lz4/1.9.4")
Expand All @@ -246,19 +246,19 @@ def requirements(self):
self.requires("openjpeg/2.5.0")

if self.options.with_openssl:
self.requires("openssl/1.1.1q")
self.requires("openssl/1.1.1u")

if self.options.with_pcre:
self.requires("pcre/8.45")

if self.options.with_pcre2:
self.requires("pcre2/10.40")
self.requires("pcre2/10.42")

if self.options.with_pg:
self.requires("libpq/14.5")
self.requires("libpq/14.7")

if self.options.with_png:
self.requires("libpng/1.6.38")
self.requires("libpng/1.6.39")

if self.options.with_podofo:
self.requires("podofo/0.9.7")
Expand All @@ -267,28 +267,28 @@ def requirements(self):
self.requires("poppler/21.07.0")

if self.options.with_proj:
self.requires("proj/9.0.1")
self.requires("proj/9.1.1")

if self.options.with_qhull:
self.requires("qhull/8.0.1")

if self.options.with_sqlite3:
self.requires("sqlite3/3.39.3")
self.requires("sqlite3/3.42.0")

if self.options.with_webp:
self.requires("libwebp/1.2.4")
self.requires("libwebp/1.3.0")

if self.options.with_xerces:
self.requires("xerces-c/3.2.3")
self.requires("xerces-c/3.2.4")

if self.options.with_xml2:
self.requires("libxml2/2.9.14")
self.requires("libxml2/2.11.4")

if self.options.with_zlib:
self.requires("zlib/1.2.12")
self.requires("zlib/1.2.13")

if self.options.with_zstd:
self.requires("zstd/1.5.2")
self.requires("zstd/1.5.5")

def package_id(self):
del self.info.options.with_crypto
Expand Down