From c761fd772fba53cb8d13872fab079fa1a4270656 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Fri, 28 Mar 2008 11:47:24 -0400 Subject: ENH: remove hard codeded arch --- Modules/CPackDeb.cmake | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake index dcce5c6..e41e8d1 100644 --- a/Modules/CPackDeb.cmake +++ b/Modules/CPackDeb.cmake @@ -34,14 +34,17 @@ ENDIF(NOT CPACK_DEBIAN_PACKAGE_VERSION) # Architecture: (mandatory) IF(NOT CPACK_DEBIAN_PACKAGE_ARCHITECTURE) -# There is no such thing as i686 architecture on debian, you should use i386 instead -# $ dpkg --print-architecture - SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE i386) + # There is no such thing as i686 architecture on debian, you should use i386 instead + # $ dpkg --print-architecture + EXECUTE_PROCESS(COMMAND dpkg --print-architecture + OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE) ENDIF(NOT CPACK_DEBIAN_PACKAGE_ARCHITECTURE) # have a look at GET_PROPERTY(result GLOBAL PROPERTY ENABLED_FEATURES), # this returns the successful FIND_PACKAGE() calls, maybe this can help # Depends: +# You should set: DEBIAN_PACKAGE_DEPENDS +# TODO: automate 'objdump -p | grep NEEDED' IF(NOT CPACK_DEBIAN_PACKAGE_DEPENDS) MESSAGE(STATUS "CPACK_DEBIAN_PACKAGE_DEPENDS not set, the package will have no dependencies.") ENDIF(NOT CPACK_DEBIAN_PACKAGE_DEPENDS) -- cgit v0.12