diff options
Diffstat (limited to 'kde3')
| -rw-r--r-- | kde3/FindKDE3.cmake | 4 | ||||
| -rw-r--r-- | kde3/KDE3Macros.cmake | 21 | ||||
| -rwxr-xr-x | kde3/am2cmake | 1 |
3 files changed, 12 insertions, 14 deletions
diff --git a/kde3/FindKDE3.cmake b/kde3/FindKDE3.cmake index f950f518..f5be090d 100644 --- a/kde3/FindKDE3.cmake +++ b/kde3/FindKDE3.cmake @@ -17,8 +17,6 @@ # 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 @@ -157,5 +155,5 @@ ENDIF (NOT KDE3_FIND_QUIETLY) #add the found Qt and KDE include directories to the current include path SET(KDE3_INCLUDE_DIRS ${QT_INCLUDE_DIR} ${KDE3_INCLUDE_DIR}) #INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} ${KDE3_INCLUDE_DIR} .) -LINK_DIRECTORIES(${KDE3_LIB_DIR}) +#LINK_DIRECTORIES(${KDE3_LIB_DIR}) 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) diff --git a/kde3/am2cmake b/kde3/am2cmake index 219f509a..d1154ae7 100755 --- a/kde3/am2cmake +++ b/kde3/am2cmake @@ -264,6 +264,7 @@ class CMakeFile inst.addFiles(files) case key when "kde_services" then inst.setLocation("/share/services") + when "kde_kcfg" then inst.setLocation("/share/config.kcfg") when "xdg_apps" then inst.setLocation("/share/applications/kde") end |