From 83aed02651e148ed08287574e8725fc380f2e922 Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Thu, 18 Sep 2014 13:27:06 +0300 Subject: [PATCH] fixed wrong debian package architecture --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f7829dcd4..d3493039a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,8 +109,10 @@ if(NOT ( ${RPMBUILD} STREQUAL "RPMBUILD-NOTFOUND" ) ) endif() if(NOT ( ${DEBBUILD} STREQUAL "DEBBUILD-NOTFOUND" ) ) - message(STATUS "Generating DEB packages") set(CPACK_GENERATOR "${CPACK_GENERATOR};DEB") + execute_process(COMMAND dpgk --print-architecture OUTPUT_VARIABLE DEB_ARCHITECTURE) + set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${DEB_ARCHITECTURE}) + message(STATUS "Generating DEB packages for ${DEB_ARCHITECTURE}") endif() set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MaxScale") @@ -123,7 +125,6 @@ set(CPACK_PACKAGE_NAME "maxscale") set(CPACK_PACKAGE_VENDOR "SkySQL Ab") set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_SOURCE_DIR}/README) set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") -set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "x86_64") set(CPACK_RPM_SPEC_INSTALL_POST "/sbin/ldconfig") set(CPACK_RPM_PACKAGE_NAME "maxscale") set(CPACK_RPM_PACKAGE_VENDOR "SkySQL Ab")