ENH: Support .hpp with automoc.
This commit is contained in:
parent
bd92bec66c
commit
dda19cd36f
@ -1167,7 +1167,11 @@ IF (QT4_QMAKE_FOUND)
|
|||||||
FOREACH (_current_MOC_INC ${_match})
|
FOREACH (_current_MOC_INC ${_match})
|
||||||
STRING(REGEX MATCH "[^ <\"]+\\.moc" _current_MOC "${_current_MOC_INC}")
|
STRING(REGEX MATCH "[^ <\"]+\\.moc" _current_MOC "${_current_MOC_INC}")
|
||||||
GET_FILENAME_COMPONENT(_basename ${_current_MOC} NAME_WE)
|
GET_FILENAME_COMPONENT(_basename ${_current_MOC} NAME_WE)
|
||||||
SET(_header ${_abs_PATH}/${_basename}.h)
|
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})
|
SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC})
|
||||||
QT4_CREATE_MOC_COMMAND(${_header} ${_moc} "${_moc_INCS}" "")
|
QT4_CREATE_MOC_COMMAND(${_header} ${_moc} "${_moc_INCS}" "")
|
||||||
MACRO_ADD_FILE_DEPENDENCIES(${_abs_FILE} ${_moc})
|
MACRO_ADD_FILE_DEPENDENCIES(${_abs_FILE} ${_moc})
|
||||||
|
Loading…
x
Reference in New Issue
Block a user