[Cmake-commits] [cmake-commits] hoffman committed CPackDeb.cmake 1.8 1.9

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv3297

Modified Files:
	CPackDeb.cmake 
Log Message:
ENH: remove hard codeded arch 


Index: CPackDeb.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPackDeb.cmake,v
retrieving revision 1.8
retrieving revision 1.9
diff -C 2 -d -r1.8 -r1.9
*** CPackDeb.cmake	17 Jan 2008 22:19:13 -0000	1.8
--- CPackDeb.cmake	28 Mar 2008 15:47:24 -0000	1.9
***************
*** 35,41 ****
  # 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)
  ENDIF(NOT CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
  
--- 35,42 ----
  # 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
!   EXECUTE_PROCESS(COMMAND dpkg --print-architecture
!     OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
  ENDIF(NOT CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
  
***************
*** 43,46 ****
--- 44,49 ----
  # 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.")