Skip to content

Commit

Permalink
Set deb and rpm architecture to any (#269)
Browse files Browse the repository at this point in the history
  • Loading branch information
DenisBiryukov91 authored Oct 31, 2024
1 parent b5fca3e commit 7af89cf
Showing 1 changed file with 2 additions and 12 deletions.
14 changes: 2 additions & 12 deletions install/cpack_project_config.cmake
Original file line number Diff line number Diff line change
@@ -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, <zenoh@zettascale.tech>")
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)
Expand All @@ -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)
Expand Down

0 comments on commit 7af89cf

Please # to comment.