From cf6a398f98df596356798d41e635101607ff711b Mon Sep 17 00:00:00 2001 From: Alexis Potvin Date: Thu, 31 Oct 2024 09:35:37 -0400 Subject: [PATCH] Add support for other architecture in debian package --- CMakeCPack.cmake | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/CMakeCPack.cmake b/CMakeCPack.cmake index 029c9089..55e0102f 100644 --- a/CMakeCPack.cmake +++ b/CMakeCPack.cmake @@ -103,11 +103,20 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Linux") set(CPACK_RPM_DEV_PACKAGE_REQUIRES "${CPACK_RPM_LIB_PACKAGE_NAME} = ${CPACK_PACKAGE_VERSION}") elseif(EXISTS "/etc/debian_version") set(CPACK_DEB_COMPONENT_INSTALL ON) - if(CMAKE_SIZEOF_VOID_P EQUAL 8) - set(__arch "amd64") - else() - set(__arch "i386") - endif() + find_program(DPKG_CMD dpkg) + if(NOT DPKG_CMD) + if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(__arch "amd64") + else() + set(__arch "i386") + endif() + else () + execute_process(COMMAND "${DPKG_CMD}" --print-architecture + OUTPUT_VARIABLE __arch + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + endif () + set(CPACK_GENERATOR "DEB;TGZ;${CPACK_GENERATOR}" CACHE STRING "List of package generators")