Merge remote-tracking branch 'zsl/build-packages-cpack' into build-pa…

…ckages-cpack
eclipse-zenoh · Oct 25, 2024 · e9995c6 · e9995c6
2 parents 317c04f + e2f13f7
commit e9995c6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -133,6 +133,9 @@ jobs:
           toolchain_file=$(readlink -f TC-${{ matrix.build.target }}.cmake)
           if [[ "${{ matrix.build.target }}" == "aarch64-unknown-linux-musl" ]]; then
             export PATH=$PATH:$(readlink -f aarch64-linux-musl-cross)/bin
+          elif  [[ "${{ matrix.build.target }}" == "x86_64-pc-windows-gnu"]]; then
+            export PATH=$PATH:C:/mingw64/bin
+            echo $PATH
           fi
           mkdir -p build  && cd build
           cmake .. -DZENOHC_CUSTOM_TARGET=${{ matrix.build.target }} -DCMAKE_TOOLCHAIN_FILE="${toolchain_file}" -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DZENOHC_BUILD_WITH_UNSTABLE_API=ON -DZENOHC_BUILD_WITH_SHARED_MEMORY=ON

diff --git a/TC-armv7-unknown-linux-gnueabihf.cmake b/TC-armv7-unknown-linux-gnueabihf.cmake
@@ -1,5 +1,4 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_PROCESSOR armv7)
 set(ZENOHC_CUSTOM_TARGET armv7-unknown-linux-gnueabihf)
-set(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc)
-set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++)
+set(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc)