diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2015-07-04 18:50:22 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-07-04 18:51:33 +0200 |
| commit | 08aedacdb691c46629f524ba26f2460d70e407a8 (patch) | |
| tree | 62ef83c4288284e6943b82ed982f034554dffb47 /kontact | |
| parent | ae9fde72adecd2ca03f9d4ff55fc30fef5a09afb (diff) | |
| download | tdepim-08aedacdb691c46629f524ba26f2460d70e407a8.tar.gz tdepim-08aedacdb691c46629f524ba26f2460d70e407a8.zip | |
Remove incorrect CMake recipe for templatesconfiguration_base
Fix CMake build dependencies
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 19e5646ba63e7255e0532295eaec2f476009d275)
Diffstat (limited to 'kontact')
| -rw-r--r-- | kontact/plugins/kmail/CMakeLists.txt | 43 |
1 files changed, 4 insertions, 39 deletions
diff --git a/kontact/plugins/kmail/CMakeLists.txt b/kontact/plugins/kmail/CMakeLists.txt index ef3fa84bc..e65a4d881 100644 --- a/kontact/plugins/kmail/CMakeLists.txt +++ b/kontact/plugins/kmail/CMakeLists.txt @@ -35,47 +35,9 @@ install( FILES kcmkmailsummary.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES kmailplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kontact ) -##### helper #################################### - -macro( process_kcfg _who _out _path _kcfg _kcfgc ) - add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/${_path}/${_out} - COMMAND - mkdir -p ${CMAKE_BINARY_DIR}/${_path} - COMMAND ${KDE3_KCFGC_EXECUTABLE} - -d ${CMAKE_BINARY_DIR}/${_path} - ${CMAKE_SOURCE_DIR}/${_path}/${_kcfg} - ${CMAKE_SOURCE_DIR}/${_path}/${_kcfgc} - DEPENDS - ${CMAKE_SOURCE_DIR}/${_path}/${_kcfg} - ${CMAKE_SOURCE_DIR}/${_path}/${_kcfgc} ) - set_property( SOURCE ${_who} APPEND - PROPERTY OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/${_path}/${_out} ) -endmacro() - - ##### libkontact_kmailplugin (module) ########### -set( KDE3_DCOPIDL_EXECUTABLE ${KDE3_DCOPIDLNG_EXECUTABLE} ) - -process_kcfg( kmail_plugin.cpp globalsettings_base.h kmail - kmail.kcfg globalsettings_base.kcfgc ) - -add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/kmail/templatesconfiguration_base.h - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/kmail - COMMAND ${CMAKE_COMMAND} - -DUIC_EXECUTABLE:FILEPATH=${UIC_EXECUTABLE} - -DTQT_REPLACE_SCRIPT:FILEPATH=${TQT_REPLACE_SCRIPT} - -DTDE_QTPLUGINS_DIR:FILEPATH=${TDE_QTPLUGINS_DIR} - -DUI_FILE:FILEPATH=${CMAKE_SOURCE_DIR}/kmail/templatesconfiguration_base.ui - -DMASTER_SOURCE_DIR:FILEPATH=${CMAKE_SOURCE_DIR} - -DMASTER_BINARY_DIR:FILEPATH=${CMAKE_BINARY_DIR} - -P ${CMAKE_MODULE_PATH}/tde_uic.cmake - DEPENDS - ${CMAKE_BINARY_DIR}/kmail/globalsettings_base.h - ${CMAKE_SOURCE_DIR}/kmail/templatesconfiguration_base.ui ) - -set_property( SOURCE kmail_plugin.cpp APPEND - PROPERTY OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/kmail/templatesconfiguration_base.h ) +tde_save_and_set( KDE3_DCOPIDL_EXECUTABLE ${KDE3_DCOPIDLNG_EXECUTABLE} ) tde_add_kpart( libkontact_kmailplugin AUTOMOC SOURCES @@ -83,8 +45,11 @@ tde_add_kpart( libkontact_kmailplugin AUTOMOC ${CMAKE_SOURCE_DIR}/kmail/kmailIface.stub LINK kpinterfaces-shared DESTINATION ${PLUGIN_INSTALL_DIR} + DEPENDENCIES kmail_settings_base ) +tde_restore( KDE3_DCOPIDL_EXECUTABLE ) + ##### kcm_kmailsummary (module) ################# |