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

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Mar 28 11:49:50 EDT 2008


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

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.9
retrieving revision 1.10
diff -C 2 -d -r1.9 -r1.10
*** CPackDeb.cmake	28 Mar 2008 15:47:24 -0000	1.9
--- CPackDeb.cmake	28 Mar 2008 15:49:48 -0000	1.10
***************
*** 37,41 ****
    # 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)
--- 37,45 ----
    # There is no such thing as i686 architecture on debian, you should use i386 instead
    # $ dpkg --print-architecture
!   FIND_PROGRAM(DPKG_CMD dpkg)
!   IF(NOT DPKG_CMD)
!     MESSAGE(FATAL_ERROR "Can not find dpkg in your path.")
!   ENDIF(NOT DPKG_CMD)
!   EXECUTE_PROCESS(COMMAND "${DPKG_CMD}" --print-architecture
      OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
  ENDIF(NOT CPACK_DEBIAN_PACKAGE_ARCHITECTURE)



More information about the Cmake-commits mailing list