fix ci

Author: wgtmac

.github/workflows/test.yml

@@ -88,7 +88,7 @@ jobs:
         shell: cmd
         run: |
           call "C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
-          bash -c "ci/scripts/build_iceberg_windows.sh $(pwd)
+          bash -c "ci/scripts/build_iceberg.sh $(pwd)
       - name: Build Example
         shell: cmd
         run: |

ci/scripts/build_example.sh

@@ -25,10 +25,21 @@ build_dir=${1}/build
 mkdir ${build_dir}
 pushd ${build_dir}
 
-cmake \
-    -DCMAKE_PREFIX_PATH=${CMAKE_INSTALL_PREFIX:-${ICEBERG_HOME}} \
-    ${source_dir}
-cmake --build .
+CMAKE_ARGS=(
+    "-DCMAKE_PREFIX_PATH=${CMAKE_INSTALL_PREFIX:-${ICEBERG_HOME}}"
+    "-DCMAKE_BUILD_TYPE=Debug"
+)
+
+BUILD_ARGS=()
+
+# Add Windows-specific toolchain file if on Windows
+if [[ "${OSTYPE}" == "msys" || "${OSTYPE}" == "win32" ]]; then
+    CMAKE_ARGS+=("-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake")
+    BUILD_ARGS+=("--config Debug")
+fi
+
+cmake "${CMAKE_ARGS[@]}" ${source_dir}
+cmake --build . "${BUILD_ARGS[@]+"${BUILD_ARGS[@]}"}"
 
 popd
 

ci/scripts/build_iceberg.sh

@@ -25,12 +25,23 @@ build_dir=${1}/build
 mkdir ${build_dir}
 pushd ${build_dir}
 
-cmake \
-    -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX:-${ICEBERG_HOME}} \
-    -DICEBERG_BUILD_STATIC=ON \
-    -DICEBERG_BUILD_SHARED=ON \
-    ${source_dir}
-cmake --build . --target install
+CMAKE_ARGS=(
+    "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX:-${ICEBERG_HOME}}"
+    "-DICEBERG_BUILD_STATIC=ON"
+    "-DICEBERG_BUILD_SHARED=ON"
+    "-DCMAKE_BUILD_TYPE=Debug"
+)
+
+BUILD_ARGS=()
+
+# Add Windows-specific toolchain file if on Windows
+if [[ "${OSTYPE}" == "msys" || "${OSTYPE}" == "win32" ]]; then
+    CMAKE_ARGS+=("-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake")
+    BUILD_ARGS+=("--config Debug")
+fi
+
+cmake "${CMAKE_ARGS[@]}" ${source_dir}
+cmake --build . "${BUILD_ARGS[@]+"${BUILD_ARGS[@]}"}" --target install
 ctest --output-on-failure -C Debug
 
 popd

ci/scripts/build_iceberg_windows.sh

@@ -171,14 +171,19 @@ function(resolve_avro_dependency)
 
     set(AVRO_VENDORED TRUE)
     set_target_properties(avrocpp_s PROPERTIES OUTPUT_NAME "iceberg_vendored_avrocpp")
+    set_target_properties(avrocpp_s PROPERTIES POSITION_INDEPENDENT_CODE ON)
     install(TARGETS avrocpp_s
             EXPORT iceberg_targets
             RUNTIME DESTINATION "${ICEBERG_INSTALL_BINDIR}"
             ARCHIVE DESTINATION "${ICEBERG_INSTALL_LIBDIR}"
             LIBRARY DESTINATION "${ICEBERG_INSTALL_LIBDIR}")
 
     # TODO: add vendored ZLIB and Snappy support
-    list(APPEND ICEBERG_SYSTEM_DEPENDENCIES ZLIB Snappy)
+    find_package(Snappy CONFIG)
+    if(Snappy_FOUND)
+      list(APPEND ICEBERG_SYSTEM_DEPENDENCIES Snappy)
+    endif()
+    list(APPEND ICEBERG_SYSTEM_DEPENDENCIES ZLIB)
   else()
     set(AVRO_VENDORED FALSE)
     list(APPEND ICEBERG_SYSTEM_DEPENDENCIES Avro)