[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.155 1.156

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake 
Log Message:

ENH:  Support OUTPUT_LOCATION property for qm files.
      Fixes #8492.



Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.155
retrieving revision 1.156
diff -C 2 -d -r1.155 -r1.156
*** FindQt4.cmake	19 Mar 2009 19:44:54 -0000	1.155
--- FindQt4.cmake	25 Mar 2009 19:29:46 -0000	1.156
***************
*** 1261,1265 ****
           GET_FILENAME_COMPONENT(_abs_FILE ${_current_FILE} ABSOLUTE)
           GET_FILENAME_COMPONENT(qm ${_abs_FILE} NAME_WE)
!          SET(qm "${CMAKE_CURRENT_BINARY_DIR}/${qm}.qm")
  
           ADD_CUSTOM_COMMAND(OUTPUT ${qm}
--- 1261,1271 ----
           GET_FILENAME_COMPONENT(_abs_FILE ${_current_FILE} ABSOLUTE)
           GET_FILENAME_COMPONENT(qm ${_abs_FILE} NAME_WE)
!          GET_SOURCE_FILE_PROPERTY(output_location ${_abs_FILE} OUTPUT_LOCATION)
!          IF(output_location)
!            FILE(MAKE_DIRECTORY "${output_location}")
!            SET(qm "${output_location}/${qm}.qm")
!          ELSE(output_location)
!            SET(qm "${CMAKE_CURRENT_BINARY_DIR}/${qm}.qm")
!          ENDIF(output_location)
  
           ADD_CUSTOM_COMMAND(OUTPUT ${qm}