[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.131 1.132

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake 
Log Message:

ENH:  For #7433, add a bit more documentation and add ability 
      to specify extra flags to lupdate.



Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.131
retrieving revision 1.132
diff -C 2 -d -r1.131 -r1.132
*** FindQt4.cmake	30 Aug 2008 13:39:33 -0000	1.131
--- FindQt4.cmake	18 Sep 2008 14:56:58 -0000	1.132
***************
*** 104,110 ****
  #        the suffix .xml appended.
  #
! #  macro QT4_CREATE_TRANSLATION( qm_files directories ... sources ... ts_files ... )
  #        out: qm_files
  #        in:  directories sources ts_files
  #        generates commands to create .ts (vie lupdate) and .qm
  #        (via lrelease) - files from directories and/or sources. The ts files are 
--- 104,113 ----
  #        the suffix .xml appended.
  #
! #  macro QT4_CREATE_TRANSLATION( qm_files directories ... sources ... 
! #                                ts_files ... OPTIONS ...)
  #        out: qm_files
  #        in:  directories sources ts_files
+ #        options: flags to pass to lupdate, such as -extensions to specify
+ #        extensions for a directory scan.
  #        generates commands to create .ts (vie lupdate) and .qm
  #        (via lrelease) - files from directories and/or sources. The ts files are 
***************
*** 1291,1297 ****
  
     MACRO(QT4_CREATE_TRANSLATION _qm_files)
        SET(_my_sources)
        SET(_my_tsfiles)
!       FOREACH (_file ${ARGN})
           GET_FILENAME_COMPONENT(_ext ${_file} EXT)
           GET_FILENAME_COMPONENT(_abs_FILE ${_file} ABSOLUTE)
--- 1294,1303 ----
  
     MACRO(QT4_CREATE_TRANSLATION _qm_files)
+       QT4_EXTRACT_OPTIONS(_lupdate_files _lupdate_options ${ARGN})
+       MESSAGE("lupdate_files ${_lupdate_files}")
+       MESSAGE("lupdate_options ${_lupdate_options}")
        SET(_my_sources)
        SET(_my_tsfiles)
!       FOREACH (_file ${_lupdate_files})
           GET_FILENAME_COMPONENT(_ext ${_file} EXT)
           GET_FILENAME_COMPONENT(_abs_FILE ${_file} ABSOLUTE)
***************
*** 1305,1309 ****
          ADD_CUSTOM_COMMAND(OUTPUT ${_ts_file}
             COMMAND ${QT_LUPDATE_EXECUTABLE}
!            ARGS ${_my_sources} -ts ${_ts_file}
             DEPENDS ${_my_sources})
        ENDFOREACH(_ts_file)
--- 1311,1315 ----
          ADD_CUSTOM_COMMAND(OUTPUT ${_ts_file}
             COMMAND ${QT_LUPDATE_EXECUTABLE}
!            ARGS ${_lupdate_options} ${_my_sources} -ts ${_ts_file}
             DEPENDS ${_my_sources})
        ENDFOREACH(_ts_file)