Added the Linux binary to the release tar ball (#20)

orenskl · Nov 23, 2024 · f56d6c3 · f56d6c3
1 parent 17c6d2c
commit f56d6c3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -50,7 +50,7 @@ jobs:
       run: ctest -C ${{env.BUILD_TYPE}}
 
     - name: Configure Pico build
-      run: cmake -DPICO_SDK_PATH=${{github.workspace}}/pico-sdk -B ${{github.workspace}}/build.pico -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -G Ninja
+      run: cmake -DHOST_BINARY_DIR=${{github.workspace}}/build.linux -DPICO_SDK_PATH=${{github.workspace}}/pico-sdk -B ${{github.workspace}}/build.pico -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -G Ninja
 
     - name: Build Pico
       run: cmake --build ${{github.workspace}}/build.pico --config ${{env.BUILD_TYPE}}

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -116,7 +116,11 @@ if (${TARGET} STREQUAL PICO)
             DESTINATION .
             RENAME pjvm-${PROJECT_VERSION}.uf2
     )
-    install(PROGRAMS ${CMAKE_SOURCE_DIR}/tools/wrapjar.sh ${BINARY_DIR}/preverify-prefix/src/preverify-build/preverify
+    set(PJVM_BIN_PROGRAMS ${CMAKE_SOURCE_DIR}/tools/wrapjar.sh ${BINARY_DIR}/preverify-prefix/src/preverify-build/preverify)
+    if (DEFINED HOST_BINARY_DIR)
+        set(PJVM_BIN_PROGRAMS ${PJVM_BIN_PROGRAMS} ${HOST_BINARY_DIR}/pjvm)
+    endif()
+    install(PROGRAMS ${PJVM_BIN_PROGRAMS}
             DESTINATION bin
     )
     install(DIRECTORY ${CMAKE_BINARY_DIR}/doc