From e730a3e51a7aaad64cc1e3cc18c561421db33f73 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Thu, 27 Apr 2006 19:15:18 +0000 Subject: -use MACRO_ADD_FILE_DEPENDENCIES() and remove the duplicated _QT4_ADD_FILE_DEPENDENCIES() Alex svn path=/trunk/KDE/kdelibs/; revision=534769 --- modules/FindQt4.cmake | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'modules') diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 25e99068..5edc2efa 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -161,6 +161,7 @@ # QT_QT_LIBRARY Qt-Library is now split INCLUDE(CheckSymbolExists) +INCLUDE(MacroAddFileDependencies) SET(QT_USE_FILE ${CMAKE_ROOT}/Modules/UseQt4.cmake) @@ -771,17 +772,6 @@ IF (QT4_QMAKE_FOUND) ENDMACRO (QT4_ADD_RESOURCES) - MACRO(_QT4_ADD_FILE_DEPENDENCIES _file) - GET_SOURCE_FILE_PROPERTY(_deps ${_file} OBJECT_DEPENDS) - IF (_deps) - SET(_deps ${_deps} ${ARGN}) - ELSE (_deps) - SET(_deps ${ARGN}) - ENDIF (_deps) - SET_SOURCE_FILES_PROPERTIES(${_file} PROPERTIES OBJECT_DEPENDS "${_deps}") - ENDMACRO(_QT4_ADD_FILE_DEPENDENCIES) - - MACRO(QT4_AUTOMOC) QT4_GET_MOC_INC_DIRS(_moc_INCS) @@ -819,7 +809,7 @@ IF (QT4_QMAKE_FOUND) DEPENDS ${_header} ) - _QT4_ADD_FILE_DEPENDENCIES(${_abs_FILE} ${_moc}) + MACRO_ADD_FILE_DEPENDENCIES(${_abs_FILE} ${_moc}) ENDFOREACH (_current_MOC_INC) ENDIF(_match) ENDIF ( NOT _skip AND EXISTS ${_abs_FILE} ) -- cgit v1.2.1