Skip to content

Commit cfcd1da

Browse files
committed
Test
1 parent 275878e commit cfcd1da

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
8989
- name: Build (CMake preset)
9090
working-directory: ${{ github.workspace }}
91-
run: cmake --build --preset "${{ matrix.preset }}" --parallel
91+
run: cmake --build "out/build/${{ matrix.preset }}" --parallel
9292

9393
- name: Upload driver pack artifact
9494
uses: actions/upload-artifact@v4

driver_Amethyst/CMakeLists.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,14 @@ if(UNIX AND NOT APPLE)
7070
set(CAPNP_COMPILE_COMMAND ${CAPNP_COMPILER} compile -o c++:. "driver.capnp")
7171
endif()
7272
else()
73-
set(CAPNP_COMPILE_COMMAND ${CAPNP_COMPILER} compile -o c++:. "driver.capnp")
73+
if (TARGET CapnProto::capnp_tool)
74+
set(CAPNP_COMPILE_COMMAND ${CMAKE_COMMAND} -E env "PATH=$<TARGET_FILE_DIR:CapnProto::capnp_tool>;$ENV{PATH}" ${CAPNP_COMPILER} compile -o c++:. "driver.capnp")
75+
elseif (DEFINED CAPNP_EXECUTABLE)
76+
get_filename_component(CAPNP_DIR "${CAPNP_EXECUTABLE}" DIRECTORY)
77+
set(CAPNP_COMPILE_COMMAND ${CMAKE_COMMAND} -E env "PATH=${CAPNP_DIR}:$ENV{PATH}" ${CAPNP_COMPILER} compile -o c++:. "driver.capnp")
78+
else()
79+
set(CAPNP_COMPILE_COMMAND ${CAPNP_COMPILER} compile -o c++:. "driver.capnp")
80+
endif()
7481
endif()
7582

7683
add_custom_command(

0 commit comments

Comments
 (0)