[Cmake-commits] [cmake-commits] hoffman committed CPackDeb.cmake 1.8.2.1 1.8.2.2 FindQt4.cmake 1.96.2.3 1.96.2.4

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CPackDeb.cmake FindQt4.cmake 
Log Message:
ENH: merge in main tree for RC 6


Index: CPackDeb.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPackDeb.cmake,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -C 2 -d -r1.8.2.1 -r1.8.2.2
*** CPackDeb.cmake	30 Mar 2008 13:09:19 -0000	1.8.2.1
--- CPackDeb.cmake	2 Apr 2008 13:16:01 -0000	1.8.2.2
***************
*** 43,47 ****
    ENDIF(NOT DPKG_CMD)
    EXECUTE_PROCESS(COMMAND "${DPKG_CMD}" --print-architecture
!     OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
  ENDIF(NOT CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
  
--- 43,49 ----
    ENDIF(NOT DPKG_CMD)
    EXECUTE_PROCESS(COMMAND "${DPKG_CMD}" --print-architecture
!     OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
!     OUTPUT_STRIP_TRAILING_WHITESPACE
!     )
  ENDIF(NOT CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
  
***************
*** 87,90 ****
--- 89,103 ----
  # You should set: CPACK_DEBIAN_PACKAGE_SUGGESTS
  
+ # CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
+ # This variable allow advanced user to add custom script to the control.tar.gz (inside the .deb archive)
+ # Typical examples are: 
+ # - conffiles
+ # - postinst
+ # - postrm
+ # - prerm"
+ # Usage:
+ # SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA 
+ #    "${CMAKE_CURRENT_SOURCE_DIR/prerm;${CMAKE_CURRENT_SOURCE_DIR}/postrm")
+ 
  
  # For debian source packages:

Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.96.2.3
retrieving revision 1.96.2.4
diff -C 2 -d -r1.96.2.3 -r1.96.2.4
*** FindQt4.cmake	30 Mar 2008 13:09:21 -0000	1.96.2.3
--- FindQt4.cmake	2 Apr 2008 13:16:02 -0000	1.96.2.4
***************
*** 62,67 ****
  #        when executing "rcc -help"
  #
- #  macro QT4_AUTOMOC(inputfile ... )
  #  macro QT4_GENERATE_MOC(inputfile outputfile )
  #
  #  macro QT4_ADD_DBUS_INTERFACE(outfiles interface basename)
--- 62,82 ----
  #        when executing "rcc -help"
  #
  #  macro QT4_GENERATE_MOC(inputfile outputfile )
+ #        creates a rule to run moc on infile and create outfile.
+ #        Use this if for some reason QT4_WRAP_CPP() isn't appropriate, e.g.
+ #        because you need a custom filename for the moc file or something similar.
+ #
+ #  macro QT4_AUTOMOC(sourcefile1 sourcefile2 ... )
+ #        This macro is still experimental.
+ #        It can be used to have moc automatically handled.
+ #        So if you have the files foo.h and foo.cpp, and in foo.h a 
+ #        a class uses the Q_OBJECT macro, moc has to run on it. If you don't
+ #        want to use QT4_WRAP_CPP() (which is reliable and mature), you can insert
+ #        #include "foo.moc"
+ #        in foo.cpp and then give foo.cpp as argument to QT4_AUTOMOC(). This will the
+ #        scan all listed files at cmake-time for such included moc files and if it finds
+ #        them cause a rule to be generated to run moc at build time on the 
+ #        accompanying header file foo.h.
+ #        If a source file has the SKIP_AUTOMOC property set it will be ignored by this macro.
  #
  #  macro QT4_ADD_DBUS_INTERFACE(outfiles interface basename)
***************
*** 1183,1187 ****
           GET_FILENAME_COMPONENT(_abs_FILE ${_current_FILE} ABSOLUTE)
           # if "SKIP_AUTOMOC" is set to true, we will not handle this file here.
!          # here. this is required to make bouic work correctly:
           # we need to add generated .cpp files to the sources (to compile them),
           # but we cannot let automoc handle them, as the .cpp files don't exist yet when
--- 1198,1202 ----
           GET_FILENAME_COMPONENT(_abs_FILE ${_current_FILE} ABSOLUTE)
           # if "SKIP_AUTOMOC" is set to true, we will not handle this file here.
!          # This is required to make uic work correctly:
           # we need to add generated .cpp files to the sources (to compile them),
           # but we cannot let automoc handle them, as the .cpp files don't exist yet when