From a49a656f1e2664811f8aa2dc1305210f9e74832f Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 20 Mar 2014 04:24:57 +0000 Subject: [PATCH] Use dpkg --print-architecture also for RPM generator. --- cmake/package.cmake.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cmake/package.cmake.in b/cmake/package.cmake.in index c3ebdc9..f0b9fd0 100644 --- a/cmake/package.cmake.in +++ b/cmake/package.cmake.in @@ -37,6 +37,7 @@ elseif (CPACK_GENERATOR MATCHES "DEB") if (NOT RV EQUAL 0) set (CPACK_DEBIAN_PACKAGE_ARCHITECTURE i386) endif () + set (CPACK_DEBIAN_PACKAGE_DEPENDS) set (CPACK_DEBIAN_PACKAGE_SECTION "devel") set (CPACK_DEBIAN_PACKAGE_PRIORITY "optional") @@ -47,6 +48,15 @@ elseif (CPACK_GENERATOR MATCHES "DEB") # RPM package elseif (CPACK_GENERATOR MATCHES "RPM") + execute_process ( + COMMAND dpkg --print-architecture + RESULT_VARIABLE RV + OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE + ) + if (NOT RV EQUAL 0) + set (CPACK_RPM_PACKAGE_ARCHITECTURE i386) + endif () + set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}") if (DEVEL) set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-devel") -- 2.7.4