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: add 3.2.3 & 3.4.1 + keep last patch version of each minor version + modernize #8635

Merged
merged 10 commits into from
Feb 28, 2022
Merged

gdal: add 3.2.3 & 3.4.1 + keep last patch version of each minor version + modernize #8635

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7132e91
bump dependencies
SpaceIm Dec 29, 2021
0b323e5
keep last patch of each minor version
SpaceIm Dec 29, 2021
1226d1e
add GDAL_DATA to runenv_info and buildenv_info
SpaceIm Dec 29, 2021
8a2ce92
support compiler=msvc in profile
SpaceIm Jan 4, 2022
a902492
add gdal/3.4.1
SpaceIm Jan 4, 2022
9449f9d
bump proj & geos
SpaceIm Jan 7, 2022
01377f4
bump dependencies
SpaceIm Feb 4, 2022
0f6d8fb
relocatable shared lib on macOS
SpaceIm Feb 4, 2022
20b7cf6
add FIXME for all shared on macOS
SpaceIm Feb 4, 2022
fde36de
fix all shared on macOS
SpaceIm Feb 26, 2022
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
Next Next commit
bump dependencies
  • Loading branch information
@SpaceIm
SpaceIm committed Jan 4, 2022
commit 7132e91d642da165281616b67aedeff6025cc4a4
18 changes: 9 additions & 9 deletions recipes/gdal/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ def requirements(self):
self.requires("libgeotiff/1.7.0")
# self.requires("libopencad/0.0.2") # TODO: use conan recipe when available instead of internal one
self.requires("libtiff/4.3.0")
self.requires("proj/8.1.1")
self.requires("proj/8.2.0")
if tools.Version(self.version) >= "3.1.0":
self.requires("flatbuffers/2.0.0")
if self.options.get_safe("with_zlib", True):
Expand All @@ -218,7 +218,7 @@ def requirements(self):
if self.options.with_libiconv:
self.requires("libiconv/1.16")
if self.options.get_safe("with_zstd"):
self.requires("zstd/1.5.0")
self.requires("zstd/1.5.1")
if self.options.with_pg:
self.requires("libpq/13.4")
# if self.options.with_libgrass:
Expand All @@ -238,9 +238,9 @@ def requirements(self):
if self.options.with_jpeg == "libjpeg":
self.requires("libjpeg/9d")
elif self.options.with_jpeg == "libjpeg-turbo":
self.requires("libjpeg-turbo/2.1.1")
self.requires("libjpeg-turbo/2.1.2")
if self.options.with_charls:
self.requires("charls/2.1.0")
self.requires("charls/2.2.0")
if self.options.with_gif:
self.requires("giflib/5.2.1")
# if self.options.with_ogdi:
Expand Down Expand Up @@ -270,21 +270,21 @@ def requirements(self):
if self.options.with_xerces:
self.requires("xerces-c/3.2.3")
if self.options.with_expat:
self.requires("expat/2.4.1")
self.requires("expat/2.4.2")
if self.options.with_libkml:
self.requires("libkml/1.3.0")
if self.options.with_odbc and self.settings.os != "Windows":
self.requires("odbc/2.3.9")
# if self.options.with_dods_root:
# self.requires("libdap/3.20.6")
if self.options.with_curl:
self.requires("libcurl/7.79.1")
self.requires("libcurl/7.80.0")
if self.options.with_xml2:
self.requires("libxml2/2.9.12")
# if self.options.with_spatialite:
# self.requires("libspatialite/4.3.0a")
if self.options.get_safe("with_sqlite3"):
self.requires("sqlite3/3.36.0")
self.requires("sqlite3/3.37.1")
# if self.options.with_rasterlite2:
# self.requires("rasterlite2/x.x.x")
if self.options.get_safe("with_pcre"):
Expand Down Expand Up @@ -317,7 +317,7 @@ def requirements(self):
if self.options.with_cryptopp:
self.requires("cryptopp/8.5.0")
if self.options.with_crypto:
self.requires("openssl/1.1.1l")
self.requires("openssl/1.1.1m")
# if not self.options.without_lerc:
# self.requires("lerc/2.1") # TODO: use conan recipe (not possible yet because lerc API is broken for GDAL)
if self.options.get_safe("with_exr"):
Expand Down Expand Up @@ -835,7 +835,7 @@ def package(self):
def package_info(self):
self.cpp_info.set_property("cmake_file_name", "GDAL")
self.cpp_info.set_property("cmake_target_name", "GDAL::GDAL")
self.cpp_info.set_property("cmake_find_mode", "both")
self.cpp_info.set_property("cmake_find_mode", "both")
self.cpp_info.set_property("pkg_config_name", "gdal")

self.cpp_info.names["cmake_find_package"] = "GDAL"
Expand Down