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.

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

gdal: Fix 3.7.3 and 3.8.3 builds by replacing Parquet and ArrowDataset version variables with Arrow one #25898

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions recipes/gdal/post_3.5.0/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ patches:
- patch_file: "patches/3.7.3/1-do-not-force-private-linking.patch"
patch_description: "Fix private linking not working for some Conan dependencies"
patch_type: "conan"
- patch_file: "patches/3.7.3/2-use-arrow-version-for-parquet.patch"
patch_description: "Use Arrow version output from find_package() for Parquet and ArrowDataset"
patch_type: "conan"
- patch_file: "patches/3.5.3/2-allow-cycles-in-cmake-targets.patch"
patch_description: "Fix CMake failure due to cyclical dependencies in CMakeDeps targets"
patch_type: "conan"
Expand All @@ -26,6 +29,9 @@ patches:
- patch_file: "patches/3.7.3/1-do-not-force-private-linking.patch"
patch_description: "Fix private linking not working for some Conan dependencies"
patch_type: "conan"
- patch_file: "patches/3.7.3/2-use-arrow-version-for-parquet.patch"
patch_description: "Use Arrow version output from find_package() for Parquet and ArrowDataset"
patch_type: "conan"
- patch_file: "patches/3.5.3/2-allow-cycles-in-cmake-targets.patch"
patch_description: "Fix CMake failure due to cyclical dependencies in CMakeDeps targets"
patch_type: "conan"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
--- ogr/ogrsf_frmts/parquet/CMakeLists.txt
+++ ogr/ogrsf_frmts/parquet/CMakeLists.txt
@@ -9,7 +9,7 @@ add_gdal_driver(TARGET ogr_Parquet
gdal_standard_includes(ogr_Parquet)
target_include_directories(ogr_Parquet PRIVATE $<TARGET_PROPERTY:ogrsf_generic,SOURCE_DIR>
$<TARGET_PROPERTY:ogr_MEM,SOURCE_DIR>)
-if(${Parquet_VERSION} VERSION_GREATER_EQUAL 10.0)
+if(${ARROW_VERSION} VERSION_GREATER_EQUAL 10.0)
if(ARROW_USE_STATIC_LIBRARIES)
gdal_target_link_libraries(ogr_Parquet PRIVATE Arrow::arrow_static Parquet::parquet_static)
else()
@@ -26,7 +26,7 @@ endif()

if (GDAL_USE_ARROWDATASET)
target_compile_definitions(ogr_Parquet PRIVATE -DGDAL_USE_ARROWDATASET)
- if(${ArrowDataset_VERSION} VERSION_GREATER_EQUAL 10.0)
+ if(${ARROW_VERSION} VERSION_GREATER_EQUAL 10.0)
if(ARROW_USE_STATIC_LIBRARIES)
gdal_target_link_libraries(ogr_Parquet PRIVATE ArrowDataset::arrow_dataset_static)
else()