Test

Author: meruune

.github/workflows/build.yml

@@ -34,6 +34,29 @@ jobs:
         with:
           submodules: true
 
+      - name: Debug workspace and presets (Linux)
+        if: runner.os == 'Linux'
+        shell: bash
+        run: |
+          set -euxo pipefail
+          echo "Workspace: $GITHUB_WORKSPACE"
+          pwd
+          ls -la
+          test -f CMakePresets.json || (echo 'Missing CMakePresets.json at workspace root' && exit 1)
+          cmake --version
+          cmake --list-presets
+
+      - name: Debug workspace and presets (Windows)
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: |
+          Write-Host "Workspace: $env:GITHUB_WORKSPACE"
+          Get-Location
+          Get-ChildItem -Force | Format-Table -AutoSize
+          if (-not (Test-Path 'CMakePresets.json')) { Write-Error 'Missing CMakePresets.json at workspace root'; exit 1 }
+          cmake --version
+          cmake --list-presets
+
       - name: Set up Ninja (Linux)
         if: runner.os == 'Linux'
         run: |
@@ -88,7 +111,7 @@ jobs:
 
       - name: Build (CMake preset)
         working-directory: ${{ github.workspace }}
-        run: cmake --build --preset "${{ matrix.preset }}" --parallel
+        run: cmake --build "out/build/${{ matrix.preset }}" --parallel
 
       - name: Upload driver pack artifact
         uses: actions/upload-artifact@v4

driver_Amethyst/CMakeLists.txt

@@ -51,24 +51,32 @@ set(CAPNP_SCHEMA_COPY "${CAPNP_OUT_DIR}/driver.capnp")
 set(CAPNP_GEN_HDR "${CAPNP_OUT_DIR}/driver.capnp.h")
 set(CAPNP_GEN_SRC "${CAPNP_OUT_DIR}/driver.capnp.c++")
 
-# Resolve capnp compiler path
+# Resolve capnp compiler path and its directory (for plugin discovery)
 set(CAPNP_COMPILER capnp)
+set(CAPNP_DIR "")
 if (TARGET CapnProto::capnp_tool)
     set(CAPNP_COMPILER $<TARGET_FILE:CapnProto::capnp_tool>)
+    set(CAPNP_DIR $<TARGET_FILE_DIR:CapnProto::capnp_tool>)
 elseif (DEFINED CAPNP_EXECUTABLE)
     set(CAPNP_COMPILER "${CAPNP_EXECUTABLE}")
-endif()
-
-# Set up the capnp compile command with PATH modification on Linux
-if(UNIX AND NOT APPLE)
-    if (TARGET CapnProto::capnp_tool)
-        set(CAPNP_COMPILE_COMMAND ${CMAKE_COMMAND} -E env "PATH=$<TARGET_FILE_DIR:CapnProto::capnp_tool>:$ENV{PATH}" ${CAPNP_COMPILER} compile -o c++:. "driver.capnp")
-    elseif (DEFINED CAPNP_EXECUTABLE)
+    get_filename_component(CAPNP_DIR "${CAPNP_EXECUTABLE}" DIRECTORY)
+else()
+    find_program(CAPNP_EXECUTABLE capnp)
+    if (CAPNP_EXECUTABLE)
+        set(CAPNP_COMPILER "${CAPNP_EXECUTABLE}")
         get_filename_component(CAPNP_DIR "${CAPNP_EXECUTABLE}" DIRECTORY)
-        set(CAPNP_COMPILE_COMMAND ${CMAKE_COMMAND} -E env "PATH=${CAPNP_DIR}:$ENV{PATH}" ${CAPNP_COMPILER} compile -o c++:. "driver.capnp")
-    else()
-        set(CAPNP_COMPILE_COMMAND ${CAPNP_COMPILER} compile -o c++:. "driver.capnp")
     endif()
+endif()
+
+# Compose PATH modification for capnpc-c++ plugin resolution on all platforms
+if (WIN32)
+    set(_PATH_SEP ";")
+else()
+    set(_PATH_SEP ":")
+endif()
+
+if (CAPNP_DIR)
+    set(CAPNP_COMPILE_COMMAND ${CMAKE_COMMAND} -E env "PATH=${CAPNP_DIR}${_PATH_SEP}$ENV{PATH}" ${CAPNP_COMPILER} compile -o c++:. "driver.capnp")
 else()
     set(CAPNP_COMPILE_COMMAND ${CAPNP_COMPILER} compile -o c++:. "driver.capnp")
 endif()