diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-01-07 16:35:35 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-01-07 16:35:35 +0000 |
| commit | 5a927c38ec1d47da5cabadd887e53eed9aff332c (patch) | |
| tree | 400e0b58de1911bf0291f8f0d559108e9b8f928f /kde3/KDE3Macros.cmake | |
| parent | ba732a732a6036c9c11c6635f574c199c6dfbab7 (diff) | |
| download | extra-cmake-modules-5a927c38ec1d47da5cabadd887e53eed9aff332c.tar.gz extra-cmake-modules-5a927c38ec1d47da5cabadd887e53eed9aff332c.tar.bz2 | |
-am2cmake: added support for installing kcfg files
-KDE3Macros.cmake: improved ADD_FILE_DEPEDENCY macro
-added sample CMakeLists.txt for kpager, kcalc, kio_man, and view1394
Alex
svn path=/trunk/KDE/kdesdk/cmake/; revision=495285
Diffstat (limited to 'kde3/KDE3Macros.cmake')
| -rw-r--r-- | kde3/KDE3Macros.cmake | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/kde3/KDE3Macros.cmake b/kde3/KDE3Macros.cmake index 93567c5f..78b94fce 100644 --- a/kde3/KDE3Macros.cmake +++ b/kde3/KDE3Macros.cmake @@ -6,10 +6,8 @@ # KDE3_ADD_UI_FILES # KDE3_ADD_KCFG_FILES # KDE3_AUTOMOC -# KDE3_TARGET_LINK_CONV_LIBRARIES # KDE3_CREATE_LIBTOOL_FILE # KDE3_PLACEHOLDER -# KDE3_CREATE_LIBTOOL_FILE # KDE3_CREATE_FINAL_FILE # KDE3_ADD_KPART # KDE3_ADD_KLM @@ -21,13 +19,16 @@ #this should better be part of cmake: #add an additional file to the list of files a source file depends on MACRO(ADD_FILE_DEPENDANCY file) - SET(${file}_deps ${${file}_deps} ${ARGN}) - SET_SOURCE_FILES_PROPERTIES( - ${file} - PROPERTIES - OBJECT_DEPENDS - "${${file}_deps}" - ) + + 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(ADD_FILE_DEPENDANCY) @@ -323,9 +324,7 @@ MACRO(KDE3_ADD_KPART _target_NAME _with_PREFIX) ADD_LIBRARY(${_target_NAME} MODULE ${_first_SRC} ${ARGN}) ENDIF (KDE3_ENABLE_FINAL) - MESSAGE(STATUS "firstSrc: ${_first_SRC}") IF(_first_SRC) - MESSAGE(STATUS "setting empty prefix for ${_target_NAME}") SET_TARGET_PROPERTIES(${_target_NAME} PROPERTIES PREFIX "") ENDIF(_first_SRC) |