From 4b246c33261a4c641fad68d37d091659d705cf4e Mon Sep 17 00:00:00 2001 From: Gang Wu Date: Wed, 3 Sep 2025 23:54:48 +0800 Subject: [PATCH 1/3] DNM: use name package name from AvroCpp --- .../IcebergThirdpartyToolchain.cmake | 23 ++++++++++--------- src/iceberg/CMakeLists.txt | 8 +++---- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/cmake_modules/IcebergThirdpartyToolchain.cmake b/cmake_modules/IcebergThirdpartyToolchain.cmake index 826d5d4fc..12a906e7c 100644 --- a/cmake_modules/IcebergThirdpartyToolchain.cmake +++ b/cmake_modules/IcebergThirdpartyToolchain.cmake @@ -179,26 +179,27 @@ function(resolve_avro_dependency) OFF CACHE BOOL "" FORCE) - fetchcontent_declare(Avro + fetchcontent_declare(AvroCpp ${FC_DECLARE_COMMON_OPTIONS} # TODO: switch to Apache Avro 1.13.0 once released. - GIT_REPOSITORY https://github.com/apache/avro.git - GIT_TAG 82a2bc8b034de34626e2ab8bf091234122474d50 + GIT_REPOSITORY https://github.com/wgtmac/avro.git + GIT_TAG 6326988a12bc3eff37ba24db167d780923ae0df4 SOURCE_SUBDIR lang/c++ FIND_PACKAGE_ARGS NAMES - Avro + AvroCpp CONFIG) - fetchcontent_makeavailable(Avro) + fetchcontent_makeavailable(AvroCpp) - if(avro_SOURCE_DIR) - if(NOT TARGET Avro::avrocpp_static) - add_library(Avro::avrocpp_static INTERFACE IMPORTED) - target_link_libraries(Avro::avrocpp_static INTERFACE avrocpp_s) - target_include_directories(Avro::avrocpp_static - INTERFACE ${avro_BINARY_DIR} ${avro_SOURCE_DIR}/lang/c++) + if(avrocpp_SOURCE_DIR) + if(NOT TARGET AvroCpp::avrocpp_static) + add_library(AvroCpp::avrocpp_static INTERFACE IMPORTED) + target_link_libraries(AvroCpp::avrocpp_static INTERFACE avrocpp_s) + target_include_directories(AvroCpp::avrocpp_static + INTERFACE ${avrocpp_BINARY_DIR} + ${avrocpp_SOURCE_DIR}/lang/c++) endif() set(AVRO_VENDORED TRUE) diff --git a/src/iceberg/CMakeLists.txt b/src/iceberg/CMakeLists.txt index bccd4d9d7..84becb26c 100644 --- a/src/iceberg/CMakeLists.txt +++ b/src/iceberg/CMakeLists.txt @@ -128,14 +128,14 @@ if(ICEBERG_BUILD_BUNDLE) "$,iceberg_static,iceberg_shared>" "$,Arrow::arrow_static,Arrow::arrow_shared>" "$,Parquet::parquet_static,Parquet::parquet_shared>" - "$,Avro::avrocpp_static,Avro::avrocpp_shared>" + "$,AvroCpp::avrocpp_static,AvroCpp::avrocpp_shared>" ) list(APPEND ICEBERG_BUNDLE_SHARED_BUILD_INTERFACE_LIBS "$,iceberg_shared,iceberg_static>" "$,Arrow::arrow_shared,Arrow::arrow_static>" "$,Parquet::parquet_shared,Parquet::parquet_static>" - "$,Avro::avrocpp_shared,Avro::avrocpp_static>" + "$,AvroCpp::avrocpp_shared,AvroCpp::avrocpp_static>" ) list(APPEND @@ -143,14 +143,14 @@ if(ICEBERG_BUILD_BUNDLE) "$,Iceberg::iceberg_static,Iceberg::iceberg_shared>" "$,Iceberg::arrow_static,$,Arrow::arrow_static,Arrow::arrow_shared>>" "$,Iceberg::parquet_static,$,Parquet::parquet_static,Parquet::parquet_shared>>" - "$,Iceberg::avrocpp_s,$,Avro::avrocpp_static,Avro::avrocpp_shared>>" + "$,Iceberg::avrocpp_s,$,AvroCpp::avrocpp_static,AvroCpp::avrocpp_shared>>" ) list(APPEND ICEBERG_BUNDLE_SHARED_INSTALL_INTERFACE_LIBS "$,Iceberg::iceberg_shared,Iceberg::iceberg_static>" "$,Iceberg::arrow_static,$,Arrow::arrow_shared,Arrow::arrow_static>>" "$,Iceberg::parquet_static,$,Parquet::parquet_shared,Parquet::parquet_static>>" - "$,Iceberg::avrocpp_s,$,Avro::avrocpp_shared,Avro::avrocpp_static>>" + "$,Iceberg::avrocpp_s,$,AvroCpp::avrocpp_shared,AvroCpp::avrocpp_static>>" ) add_iceberg_lib(iceberg_bundle From e007431129c6d9b97321e77a18ea7cada6d71485 Mon Sep 17 00:00:00 2001 From: Gang Wu Date: Thu, 4 Sep 2025 10:07:27 +0800 Subject: [PATCH 2/3] rename to avro-cpp --- .../IcebergThirdpartyToolchain.cmake | 22 +++++++++---------- src/iceberg/CMakeLists.txt | 8 +++---- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cmake_modules/IcebergThirdpartyToolchain.cmake b/cmake_modules/IcebergThirdpartyToolchain.cmake index 12a906e7c..776f9ad0e 100644 --- a/cmake_modules/IcebergThirdpartyToolchain.cmake +++ b/cmake_modules/IcebergThirdpartyToolchain.cmake @@ -179,27 +179,27 @@ function(resolve_avro_dependency) OFF CACHE BOOL "" FORCE) - fetchcontent_declare(AvroCpp + fetchcontent_declare(avro-cpp ${FC_DECLARE_COMMON_OPTIONS} # TODO: switch to Apache Avro 1.13.0 once released. GIT_REPOSITORY https://github.com/wgtmac/avro.git - GIT_TAG 6326988a12bc3eff37ba24db167d780923ae0df4 + GIT_TAG c96d8984964e27435a99378d5f6ef20362bc458d SOURCE_SUBDIR lang/c++ FIND_PACKAGE_ARGS NAMES - AvroCpp + avro-cpp CONFIG) - fetchcontent_makeavailable(AvroCpp) + fetchcontent_makeavailable(avro-cpp) - if(avrocpp_SOURCE_DIR) - if(NOT TARGET AvroCpp::avrocpp_static) - add_library(AvroCpp::avrocpp_static INTERFACE IMPORTED) - target_link_libraries(AvroCpp::avrocpp_static INTERFACE avrocpp_s) - target_include_directories(AvroCpp::avrocpp_static - INTERFACE ${avrocpp_BINARY_DIR} - ${avrocpp_SOURCE_DIR}/lang/c++) + if(avro-cpp_SOURCE_DIR) + if(NOT TARGET avro-cpp::avrocpp_static) + add_library(avro-cpp::avrocpp_static INTERFACE IMPORTED) + target_link_libraries(avro-cpp::avrocpp_static INTERFACE avrocpp_s) + target_include_directories(avro-cpp::avrocpp_static + INTERFACE ${avro-cpp_BINARY_DIR} + ${avro-cpp_SOURCE_DIR}/lang/c++) endif() set(AVRO_VENDORED TRUE) diff --git a/src/iceberg/CMakeLists.txt b/src/iceberg/CMakeLists.txt index 84becb26c..2f676af34 100644 --- a/src/iceberg/CMakeLists.txt +++ b/src/iceberg/CMakeLists.txt @@ -128,14 +128,14 @@ if(ICEBERG_BUILD_BUNDLE) "$,iceberg_static,iceberg_shared>" "$,Arrow::arrow_static,Arrow::arrow_shared>" "$,Parquet::parquet_static,Parquet::parquet_shared>" - "$,AvroCpp::avrocpp_static,AvroCpp::avrocpp_shared>" + "$,avro-cpp::avrocpp_static,avro-cpp::avrocpp_shared>" ) list(APPEND ICEBERG_BUNDLE_SHARED_BUILD_INTERFACE_LIBS "$,iceberg_shared,iceberg_static>" "$,Arrow::arrow_shared,Arrow::arrow_static>" "$,Parquet::parquet_shared,Parquet::parquet_static>" - "$,AvroCpp::avrocpp_shared,AvroCpp::avrocpp_static>" + "$,avro-cpp::avrocpp_shared,avro-cpp::avrocpp_static>" ) list(APPEND @@ -143,14 +143,14 @@ if(ICEBERG_BUILD_BUNDLE) "$,Iceberg::iceberg_static,Iceberg::iceberg_shared>" "$,Iceberg::arrow_static,$,Arrow::arrow_static,Arrow::arrow_shared>>" "$,Iceberg::parquet_static,$,Parquet::parquet_static,Parquet::parquet_shared>>" - "$,Iceberg::avrocpp_s,$,AvroCpp::avrocpp_static,AvroCpp::avrocpp_shared>>" + "$,Iceberg::avrocpp_s,$,avro-cpp::avrocpp_static,avro-cpp::avrocpp_shared>>" ) list(APPEND ICEBERG_BUNDLE_SHARED_INSTALL_INTERFACE_LIBS "$,Iceberg::iceberg_shared,Iceberg::iceberg_static>" "$,Iceberg::arrow_static,$,Arrow::arrow_shared,Arrow::arrow_static>>" "$,Iceberg::parquet_static,$,Parquet::parquet_shared,Parquet::parquet_static>>" - "$,Iceberg::avrocpp_s,$,AvroCpp::avrocpp_shared,AvroCpp::avrocpp_static>>" + "$,Iceberg::avrocpp_s,$,avro-cpp::avrocpp_shared,avro-cpp::avrocpp_static>>" ) add_iceberg_lib(iceberg_bundle From b38cccdc07c6fe809e2729c3af658046c37653c1 Mon Sep 17 00:00:00 2001 From: Gang Wu Date: Fri, 5 Sep 2025 10:14:14 +0800 Subject: [PATCH 3/3] use apache repo --- cmake_modules/IcebergThirdpartyToolchain.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake_modules/IcebergThirdpartyToolchain.cmake b/cmake_modules/IcebergThirdpartyToolchain.cmake index 776f9ad0e..453020aca 100644 --- a/cmake_modules/IcebergThirdpartyToolchain.cmake +++ b/cmake_modules/IcebergThirdpartyToolchain.cmake @@ -182,8 +182,8 @@ function(resolve_avro_dependency) fetchcontent_declare(avro-cpp ${FC_DECLARE_COMMON_OPTIONS} # TODO: switch to Apache Avro 1.13.0 once released. - GIT_REPOSITORY https://github.com/wgtmac/avro.git - GIT_TAG c96d8984964e27435a99378d5f6ef20362bc458d + GIT_REPOSITORY https://github.com/apache/avro.git + GIT_TAG e6c308780e876b4c11a470b9900995947f7b0fb5 SOURCE_SUBDIR lang/c++ FIND_PACKAGE_ARGS