diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-02-07 21:49:31 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-02-07 21:49:31 +0000 |
| commit | fce52d437088520993f5f0df591408aa7e8e6eb4 (patch) | |
| tree | 99b58b5ce2657a75b95a118c157c92ac0612b8f6 /modules/KDE4Macros.cmake | |
| parent | 33ef2dcde9be9d37e41a3c905f85849e918a240a (diff) | |
| download | extra-cmake-modules-fce52d437088520993f5f0df591408aa7e8e6eb4.tar.gz extra-cmake-modules-fce52d437088520993f5f0df591408aa7e8e6eb4.tar.bz2 | |
two new macros: macro_append_directory_properties() and macro_append_source_files_properties()
don't use CMAKE_INCLUDE_PATH and CMAKE_LIBRARY_PATH in FindKDE4.cmake
clean more files
Alex
svn path=/trunk/KDE/kdelibs/; revision=506927
Diffstat (limited to 'modules/KDE4Macros.cmake')
| -rw-r--r-- | modules/KDE4Macros.cmake | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index d8566dab..db49f3a2 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -18,18 +18,18 @@ #this should better be part of cmake: #add an additional file to the list of files a source file depends on -MACRO(KDE4_ADD_FILE_DEPENDANCY 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(KDE4_ADD_FILE_DEPENDANCY) +#MACRO(KDE4_ADD_FILE_DEPENDANCY 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(KDE4_ADD_FILE_DEPENDANCY) #create the kidl and skeletion file for dcop stuff @@ -275,7 +275,8 @@ MACRO(KDE4_AUTOMOC) DEPENDS ${_header} ) - KDE4_ADD_FILE_DEPENDANCY(${_tmp_FILE} ${_moc}) +# KDE4_ADD_FILE_DEPENDANCY(${_tmp_FILE} ${_moc}) + MACRO_APPEND_SOURCE_FILES_PROPERTIES(${_tmp_FILE} PROPERTIES OBJECT_DEPENDS ${_moc} ) ENDFOREACH (_current_MOC_INC) ENDIF(_match) @@ -396,6 +397,7 @@ MACRO(KDE4_CREATE_LIBTOOL_FILE _target _subdir) FILE(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/${KDE4_LIB_INSTALL_DIR}/${_subdir}'\n") INSTALL_FILES(${KDE4_LIB_INSTALL_DIR}/${_subdir} FILES ${_laname}) + MACRO_APPEND_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${_laname}) ENDMACRO(KDE4_CREATE_LIBTOOL_FILE) @@ -448,6 +450,7 @@ ENDMACRO(KDE4_ADD_PLUGIN _target_NAME _with_PREFIX) MACRO(KDE4_ADD_KDEINIT_EXECUTABLE _target_NAME ) CONFIGURE_FILE(${KDE4_MODULE_DIR}/kde4init_dummy.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp) + MACRO_APPEND_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp ) # IF (WIN32) # # under windows, just build a normal executable |