Fix CI

Author: justing-bq

.github/workflows/cpp_odbc.yml

@@ -27,12 +27,12 @@ on:
     paths:
       - '.github/workflows/cpp_odbc.yml'
       - 'ci/scripts/cpp_*'
-      - 'cpp/src/arrow/flight/sql/odbc/*'
+      - 'cpp/src/arrow/flight/sql/odbc/**'
   pull_request:
     paths:
       - '.github/workflows/cpp_odbc.yml'
       - 'ci/scripts/cpp_*'
-      - 'cpp/src/arrow/flight/sql/odbc/*'
+      - 'cpp/src/arrow/flight/sql/odbc/**'
   schedule:
     - cron: '0 13 * * *'
 
@@ -195,6 +195,7 @@ jobs:
       ARROW_BUILD_TESTS: ON
       ARROW_FLIGHT_SQL_ODBC: ON
       ARROW_HOME: /tmp/local
+      ARROW_CMAKE_ARGS: "-I${ODBC_INCLUDE_DIR:-}"
     steps:
       - name: Checkout Arrow
         uses: actions/checkout@v6.0.0
@@ -206,7 +207,6 @@ jobs:
           brew bundle --file=cpp/Brewfile
           export LIBIODBC_DIR="$(brew --cellar libiodbc)/$(brew list --versions libiodbc | awk '{print $2}')"
           echo ODBC_INCLUDE_DIR="$LIBIODBC_DIR/include" >> $GITHUB_ENV
-          echo ODBC_LIB_DIR="$LIBIODBC_DIR/lib" >> $GITHUB_ENV
       - name: Setup ccache
         run: |
           ci/scripts/ccache_setup.sh
@@ -231,12 +231,12 @@ jobs:
           # include path. So we disable -Werror to avoid build error
           # by warnings from packages installed by Homebrew.
           export BUILD_WARNING_LEVEL=PRODUCTION
-          ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
+          bash ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
       - name: Register Flight SQL ODBC Driver
         run: |
            chmod +x cpp/src/arrow/flight/sql/odbc/install/mac/install_odbc.sh
            sudo cpp/src/arrow/flight/sql/odbc/install/mac/install_odbc.sh $(pwd)/build/cpp/debug/libarrow_flight_sql_odbc.dylib
       - name: Test
         shell: bash
         run: |
-          ci/scripts/cpp_test.sh $(pwd) $(pwd)/build
+          bash ci/scripts/cpp_test.sh $(pwd) $(pwd)/build

ci/scripts/cpp_build.sh

@@ -260,7 +260,7 @@ else
     -DCMAKE_BUILD_TYPE=${ARROW_BUILD_TYPE:-debug} \
     -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE:-OFF} \
     -DCMAKE_C_FLAGS="${CFLAGS:-}" \
-    -DCMAKE_CXX_FLAGS="${CXXFLAGS:-} -I${ODBC_INCLUDE_DIR:-} -L${ODBC_LIB_DIR:-}" \
+    -DCMAKE_CXX_FLAGS="${CXXFLAGS:-}" \
     -DCMAKE_CXX_STANDARD="${CMAKE_CXX_STANDARD:-20}" \
     -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR:-lib} \
     -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX:-${ARROW_HOME}} \

cpp/src/arrow/flight/sql/odbc/odbc_impl/CMakeLists.txt

@@ -129,9 +129,22 @@ if(WIN32)
                          system_dsn.h)
 endif()
 
+if(APPLE)
+    # iODBC from Homebrew (Intel + ARM)
+    target_include_directories(arrow_odbc_spi_impl SYSTEM BEFORE PUBLIC ${ODBC_INCLUDE_DIR})
+
+    target_link_libraries(arrow_odbc_spi_impl
+        PUBLIC arrow_flight_sql_shared arrow_compute_shared Boost::locale iodbc)
+else()
+    find_package(ODBC REQUIRED)
+    target_include_directories(arrow_odbc_spi_impl PUBLIC ${ODBC_INCLUDE_DIR})
+    target_link_libraries(arrow_odbc_spi_impl
+        PUBLIC arrow_flight_sql_shared arrow_compute_shared Boost::locale
+               ${ODBC_LIBRARIES})
+endif()
+
 target_link_libraries(arrow_odbc_spi_impl
-                      PUBLIC arrow_flight_sql_shared arrow_compute_shared Boost::locale
-                             ${ODBCINST})
+                      PUBLIC arrow_flight_sql_shared arrow_compute_shared Boost::locale)
 
 set_target_properties(arrow_odbc_spi_impl
                       PROPERTIES ARCHIVE_OUTPUT_DIRECTORY