[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.133 1.134

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake 
Log Message:

ENH:  Fix #7433.  Put list of files in a .pro file and call lupdate on it,
                  instead of putting the list of files on the command line.



Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.133
retrieving revision 1.134
diff -C 2 -d -r1.133 -r1.134
*** FindQt4.cmake	22 Sep 2008 18:00:37 -0000	1.133
--- FindQt4.cmake	22 Sep 2008 19:00:31 -0000	1.134
***************
*** 1296,1300 ****
--- 1296,1302 ----
        QT4_EXTRACT_OPTIONS(_lupdate_files _lupdate_options ${ARGN})
        SET(_my_sources)
+       SET(_my_dirs)
        SET(_my_tsfiles)
+       SET(_ts_pro)
        FOREACH (_file ${_lupdate_files})
           GET_FILENAME_COMPONENT(_ext ${_file} EXT)
***************
*** 1303,1314 ****
             LIST(APPEND _my_tsfiles ${_abs_FILE})
           ELSE(_ext MATCHES "ts")
!            LIST(APPEND _my_sources ${_abs_FILE})
           ENDIF(_ext MATCHES "ts")
        ENDFOREACH(_file)
        FOREACH(_ts_file ${_my_tsfiles})
          ADD_CUSTOM_COMMAND(OUTPUT ${_ts_file}
             COMMAND ${QT_LUPDATE_EXECUTABLE}
!            ARGS ${_lupdate_options} ${_my_sources} -ts ${_ts_file}
!            DEPENDS ${_my_sources})
        ENDFOREACH(_ts_file)
        QT4_ADD_TRANSLATION(${_qm_files} ${_my_tsfiles})
--- 1305,1328 ----
             LIST(APPEND _my_tsfiles ${_abs_FILE})
           ELSE(_ext MATCHES "ts")
!            IF(NOT _ext)
!              LIST(APPEND _my_dirs ${_abs_FILE})
!            ELSE(NOT _ext)
!              LIST(APPEND _my_sources ${_abs_FILE})
!            ENDIF(NOT _ext)
           ENDIF(_ext MATCHES "ts")
        ENDFOREACH(_file)
        FOREACH(_ts_file ${_my_tsfiles})
+         IF(_my_sources)
+           # make a .pro file to call lupdate on, so we don't make our commands too
+           # long for some systems
+           GET_FILENAME_COMPONENT(_ts_name ${_ts_file} NAME_WE)
+           SET(_ts_pro ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${_ts_name}_lupdate.pro)
+           STRING(REPLACE ";" " " _pro_srcs "${_my_sources}")
+           FILE(WRITE ${_ts_pro} "SOURCES = ${_pro_srcs}")
+         ENDIF(_my_sources)
          ADD_CUSTOM_COMMAND(OUTPUT ${_ts_file}
             COMMAND ${QT_LUPDATE_EXECUTABLE}
!            ARGS ${_lupdate_options} ${_ts_pro} ${_my_dirs} -ts ${_ts_file}
!            DEPENDS ${_my_sources} ${_ts_pro})
        ENDFOREACH(_ts_file)
        QT4_ADD_TRANSLATION(${_qm_files} ${_my_tsfiles})