Fix arch detection for MSVC cross-compile, skip tests for x86/ARM64

- Use CMAKE_GENERATOR_PLATFORM to detect target arch on MSVC (Win32/ARM64)
  instead of CMAKE_SYSTEM_PROCESSOR which always reports the host arch
- Only run tests for x64 and Linux (native arch); x86/ARM64 are build-only
  because 32-bit ODBC registration on 64-bit CI is unreliable and ARM64
  binaries cannot execute on x64 hosts

Author: fdcastel

.github/workflows/build-and-test.yml

@@ -49,14 +49,17 @@ jobs:
         run: sudo apt-get update && sudo apt-get install -y unixodbc unixodbc-dev
 
       - name: Build, install and test
-        if: matrix.arch != 'ARM64'
+        if: ${{ !matrix.arch || matrix.arch == 'x64' }}
         shell: pwsh
         env:
           API_GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: Invoke-Build test -Configuration Release -Architecture ${{ matrix.arch }} -File ./firebird-odbc-driver.build.ps1
+        run: |
+          $archArgs = @{}
+          if ('${{ matrix.arch }}') { $archArgs['Architecture'] = '${{ matrix.arch }}' }
+          Invoke-Build test -Configuration Release @archArgs -File ./firebird-odbc-driver.build.ps1
 
       - name: Build only (cross-compile)
-        if: matrix.arch == 'ARM64'
+        if: ${{ matrix.arch && matrix.arch != 'x64' }}
         shell: pwsh
         env:
           API_GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CMakeLists.txt

@@ -44,9 +44,19 @@ option(BUILD_TESTING "Build tests" ON)
 # ---------------------------------------------------------------------------
 # CPU architecture detection (from PR #248)
 # ---------------------------------------------------------------------------
-# Prefer CMAKE_SYSTEM_PROCESSOR (correct for cross-compilation, e.g. -A Win32
-# or -A ARM64 on MSVC), fall back to CMAKE_HOST_SYSTEM_PROCESSOR for native.
-if(CMAKE_SYSTEM_PROCESSOR)
+# On MSVC multi-config generators, -A Win32/ARM64 sets CMAKE_GENERATOR_PLATFORM
+# but CMAKE_SYSTEM_PROCESSOR stays as the host arch. Use the generator platform
+# when available to get the correct target architecture.
+if(CMAKE_GENERATOR_PLATFORM)
+    string(TOUPPER "${CMAKE_GENERATOR_PLATFORM}" _PLAT)
+    if(_PLAT STREQUAL "WIN32")
+        set(FBODBC_ARCH "x86")
+    elseif(_PLAT STREQUAL "ARM64")
+        set(FBODBC_ARCH "ARM64")
+    else()
+        set(FBODBC_ARCH "${CMAKE_GENERATOR_PLATFORM}")
+    endif()
+elseif(CMAKE_SYSTEM_PROCESSOR)
     set(FBODBC_ARCH ${CMAKE_SYSTEM_PROCESSOR})
 else()
     set(FBODBC_ARCH ${CMAKE_HOST_SYSTEM_PROCESSOR})