[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.148 1.149

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake 
Log Message:

ENH:  Support .hpp with automoc.



Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.148
retrieving revision 1.149
diff -C 2 -d -r1.148 -r1.149
*** FindQt4.cmake	7 Feb 2009 17:23:02 -0000	1.148
--- FindQt4.cmake	9 Feb 2009 21:42:19 -0000	1.149
***************
*** 1168,1172 ****
                    STRING(REGEX MATCH "[^ <\"]+\\.moc" _current_MOC "${_current_MOC_INC}")
                    GET_FILENAME_COMPONENT(_basename ${_current_MOC} NAME_WE)
!                   SET(_header ${_abs_PATH}/${_basename}.h)
                    SET(_moc    ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC})
                    QT4_CREATE_MOC_COMMAND(${_header} ${_moc} "${_moc_INCS}" "")
--- 1168,1176 ----
                    STRING(REGEX MATCH "[^ <\"]+\\.moc" _current_MOC "${_current_MOC_INC}")
                    GET_FILENAME_COMPONENT(_basename ${_current_MOC} NAME_WE)
!                   IF(EXISTS ${_abs_PATH}/${_basename}.hpp)
!                     SET(_header ${_abs_PATH}/${_basename}.hpp)
!                   ELSE(EXISTS ${_abs_PATH}/${_basename}.hpp)
!                     SET(_header ${_abs_PATH}/${_basename}.h)
!                   ENDIF(EXISTS ${_abs_PATH}/${_basename}.hpp)
                    SET(_moc    ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC})
                    QT4_CREATE_MOC_COMMAND(${_header} ${_moc} "${_moc_INCS}" "")