Merge remote-tracking branch 'DenisBiryukov91/fix-pacakge' into build…

…-packages-cpack
eclipse-zenoh · Oct 30, 2024 · 4765634 · 4765634
2 parents d531205 + 1b7c265
commit 4765634
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
@@ -107,6 +107,7 @@ set(CPACK_COMPONENT_HEADERS_DEPENDS lib)
 set(CPACK_COMPONENT_DEV_DEPENDS lib)
 
 set(CPACK_GENERATOR ZIP)
+set(CPACK_CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR})
 
 if(NOT CPACK_PACKAGE_VERSION)
     set(SEM_VER "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")

diff --git a/install/cpack_project_config.cmake b/install/cpack_project_config.cmake
@@ -1,4 +1,4 @@
-set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_PROCESSOR}")
+set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_CMAKE_SYSTEM_PROCESSOR}")
 if(CPACK_GENERATOR MATCHES "DEB")
     # DEB package
     set(CPACK_DEBIAN_PACKAGE_MAINTAINER "ZettaScale Zenoh Team, <[email protected]>")