fix cross-compilation issues

Author: anonrig

.github/workflows/_build.yaml

@@ -45,6 +45,10 @@ on:
         default: 'OFF'
 
       # Windows-specific
+      generator:
+        type: string
+        required: false
+        default: 'Ninja'
       arch:
         type: string
         required: false
@@ -130,14 +134,20 @@ jobs:
         if: ${{ !inputs.use_run_on_arch }}
         shell: bash
         run: |
-          CMAKE_ARGS="-G Ninja -B build"
+          CMAKE_ARGS="-G \"${{ inputs.generator }}\" -B build"
           CMAKE_ARGS="$CMAKE_ARGS -DADA_TESTING=${{ inputs.testing }}"
           CMAKE_ARGS="$CMAKE_ARGS -DADA_BENCHMARKS=${{ inputs.benchmarks }}"
           CMAKE_ARGS="$CMAKE_ARGS -DBUILD_SHARED_LIBS=${{ inputs.shared }}"
           CMAKE_ARGS="$CMAKE_ARGS -DADA_USE_SIMDUTF=${{ inputs.simdutf }}"
-          if [ -n "${{ inputs.build_type }}" ]; then
+          # For multi-config generators (Visual Studio), don't set CMAKE_BUILD_TYPE
+          # For single-config generators (Ninja, Make), set it
+          if [[ "${{ inputs.generator }}" != *"Visual Studio"* ]] && [ -n "${{ inputs.build_type }}" ]; then
             CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_BUILD_TYPE=${{ inputs.build_type }}"
           fi
+          # Visual Studio generator: add architecture
+          if [ -n "${{ inputs.arch }}" ]; then
+            CMAKE_ARGS="$CMAKE_ARGS -A ${{ inputs.arch }}"
+          fi
           if [ -n "${{ inputs.toolchain_file }}" ]; then
             CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${{ inputs.toolchain_file }}"
           fi
@@ -151,14 +161,21 @@ jobs:
             export QEMU_CPU="${{ inputs.qemu_cpu }}"
           fi
           echo "Running: cmake $CMAKE_ARGS"
-          cmake $CMAKE_ARGS
+          eval cmake $CMAKE_ARGS
         env:
           CXX: ${{ inputs.cxx }}
           CXXFLAGS: ${{ inputs.cxxflags }}
 
       - name: Build
         if: ${{ !inputs.use_run_on_arch }}
-        run: cmake --build build -j=4
+        shell: bash
+        run: |
+          BUILD_ARGS="--build build -j=4"
+          # For multi-config generators (Visual Studio), specify config at build time
+          if [[ "${{ inputs.generator }}" == *"Visual Studio"* ]] && [ -n "${{ inputs.build_type }}" ]; then
+            BUILD_ARGS="$BUILD_ARGS --config ${{ inputs.build_type }}"
+          fi
+          cmake $BUILD_ARGS
 
       - name: Test
         if: ${{ !inputs.use_run_on_arch && inputs.run_tests }}
@@ -170,7 +187,12 @@ jobs:
           if [ -n "${{ inputs.qemu_cpu }}" ]; then
             export QEMU_CPU="${{ inputs.qemu_cpu }}"
           fi
-          ctest --output-on-failure --test-dir build
+          TEST_ARGS="--output-on-failure --test-dir build"
+          # For multi-config generators (Visual Studio), specify config at test time
+          if [[ "${{ inputs.generator }}" == *"Visual Studio"* ]] && [ -n "${{ inputs.build_type }}" ]; then
+            TEST_ARGS="$TEST_ARGS -C ${{ inputs.build_type }}"
+          fi
+          ctest $TEST_ARGS
 
       - name: Run benchmarks
         if: ${{ !inputs.use_run_on_arch && inputs.run_benchmarks }}

.github/workflows/windows.yml

@@ -21,19 +21,21 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  # MSVC builds
+  # MSVC builds (use Visual Studio generator for native MSVC support)
   msvc:
     strategy:
       fail-fast: false
       matrix:
         include:
-          - { build_type: Release, shared: OFF, cmake_args: '' }
-          - { build_type: Debug, shared: OFF, cmake_args: '-DADA_DEVELOPMENT_CHECKS=ON' }
-          - { build_type: Debug, shared: ON, cmake_args: '-DADA_DEVELOPMENT_CHECKS=ON' }
+          - { build_type: Release, shared: OFF, arch: x64, cmake_args: '' }
+          - { build_type: Debug, shared: OFF, arch: x64, cmake_args: '-DADA_DEVELOPMENT_CHECKS=ON' }
+          - { build_type: Debug, shared: ON, arch: x64, cmake_args: '-DADA_DEVELOPMENT_CHECKS=ON' }
     name: msvc (${{ matrix.build_type }}, shared=${{ matrix.shared }})
     uses: ./.github/workflows/_build.yaml
     with:
       runner: windows-2025
+      generator: 'Visual Studio 17 2022'
+      arch: ${{ matrix.arch }}
       shared: ${{ matrix.shared }}
       build_type: ${{ matrix.build_type }}
       cmake_args: ${{ matrix.cmake_args }}
@@ -49,4 +51,4 @@ jobs:
     with:
       runner: windows-2025
       build_type: ${{ matrix.build_type }}
-      cmake_args: '-DADA_DEVELOPMENT_CHECKS=ON -DCMAKE_CXX_COMPILER=clang-cl'
+      cmake_args: '-DADA_DEVELOPMENT_CHECKS=ON -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl'

tests/CMakeLists.txt

@@ -52,7 +52,18 @@ endif()
 macro(add_gtest_test exe cpp)
   add_executable(${exe} ${cpp})
   target_link_libraries(${exe} PRIVATE simdjson GTest::gtest_main)
-  gtest_discover_tests(${exe} PROPERTIES TEST_DISCOVERY_TIMEOUT 600)
+  # Use PRE_TEST discovery mode for cross-compilation where the test binary
+  # cannot be executed at build time (e.g., LoongArch via QEMU).
+  # Use POST_BUILD (default) for native builds to avoid DLL/PATH issues on Windows.
+  if(CMAKE_CROSSCOMPILING)
+    set(GTEST_DISCOVERY_MODE PRE_TEST)
+  else()
+    set(GTEST_DISCOVERY_MODE POST_BUILD)
+  endif()
+  gtest_discover_tests(${exe}
+    DISCOVERY_MODE ${GTEST_DISCOVERY_MODE}
+    PROPERTIES TEST_DISCOVERY_TIMEOUT 600
+  )
   set_source_files_properties(${cpp} PROPERTIES SKIP_LINTING ON)
 endmacro()