File tree Expand file tree Collapse file tree 2 files changed +9
-2
lines changed
Expand file tree Collapse file tree 2 files changed +9
-2
lines changed Original file line number Diff line number Diff line change 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
Original file line number Diff line number Diff 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 ()
7272else ()
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 ()
7481endif ()
7582
7683add_custom_command (
You can’t perform that action at this time.
0 commit comments