From 7af89cf7b9f498b021f890465555c98186d7169c Mon Sep 17 00:00:00 2001 From: DenisBiryukov91 <155981813+DenisBiryukov91@users.noreply.github.com> Date: Thu, 31 Oct 2024 10:49:06 +0100 Subject: [PATCH] Set deb and rpm architecture to any (#269) --- install/cpack_project_config.cmake | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/install/cpack_project_config.cmake b/install/cpack_project_config.cmake index c88d97d..34410e4 100644 --- a/install/cpack_project_config.cmake +++ b/install/cpack_project_config.cmake @@ -1,15 +1,8 @@ if(CPACK_GENERATOR MATCHES "DEB") # DEB package - if(NOT DEBARCH) - execute_process( - COMMAND dpkg --print-architecture - OUTPUT_VARIABLE DEBARCH - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - endif() message(STATUS "Configure DEB packaging for Linux ${DEBARCH}") set(CPACK_DEBIAN_PACKAGE_MAINTAINER "ZettaScale Zenoh Team, ") - set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${DEBARCH}) + set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE all) set(CPACK_DEB_COMPONENT_INSTALL OFF) set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT) set(CPACK_DEBIAN_PACKAGE_NAME lib${CPACK_PACKAGE_NAME}-dev) @@ -20,11 +13,8 @@ if(CPACK_GENERATOR MATCHES "RPM") # RPM package # rpmbuild should be installed # apt install rpm - if(NOT RPMARCH) - set(RPMARCH ${CMAKE_SYSTEM_PROCESSOR}) - endif() message(STATUS "Configure RPM packaging for Linux ${RPMARCH}") - set(CPACK_RPM_PACKAGE_ARCHITECTURE ${RPMARCH}) + set(CPACK_RPM_PACKAGE_ARCHITECTURE noarch) set(CPACK_RPM_COMPONENT_INSTALL OFF) set(CPACK_RPM_FILE_NAME RPM-DEFAULT) set(CPACK_RPM_PACKAGE_NAME ${CPACK_PACKAGE_NAME}-dev)