Commit a49a656f authored by Andreas Schuh's avatar Andreas Schuh

Use dpkg --print-architecture also for RPM generator.

parent e8890f27
......@@ -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")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment