From 8f289a4fcf86668a49e346ca5fa246c5f5ec6806 Mon Sep 17 00:00:00 2001 From: samelian Date: Mon, 21 Mar 2011 20:41:08 +0000 Subject: [PATCH] [kdepim] initial cmake support for: karm, kmailcvt, kabc, kfile-plugins, konsolekalendar git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1225584 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- CMakeLists.txt | 10 +++ kabc/CMakeLists.txt | 13 ++++ kabc/kabc2mutt/CMakeLists.txt | 29 +++++++++ kabc/kabcdistlistupdater/CMakeLists.txt | 42 +++++++++++++ karm/CMakeLists.txt | 82 +++++++++++++++++++++++++ karm/karm_part.cpp | 2 +- karm/karmstorage.h | 1 - karm/pics/CMakeLists.txt | 19 ++++++ karm/support/CMakeLists.txt | 12 ++++ karm/task.h | 2 - kfile-plugins/CMakeLists.txt | 13 ++++ kfile-plugins/ics/CMakeLists.txt | 39 ++++++++++++ kfile-plugins/vcf/CMakeLists.txt | 35 +++++++++++ kmailcvt/CMakeLists.txt | 49 +++++++++++++++ kmailcvt/pics/CMakeLists.txt | 12 ++++ konsolekalendar/CMakeLists.txt | 68 ++++++++++++++++++++ konsolekalendar/pixmaps/CMakeLists.txt | 12 ++++ 17 files changed, 436 insertions(+), 4 deletions(-) create mode 100644 kabc/CMakeLists.txt create mode 100644 kabc/kabc2mutt/CMakeLists.txt create mode 100644 kabc/kabcdistlistupdater/CMakeLists.txt create mode 100644 karm/CMakeLists.txt create mode 100644 karm/pics/CMakeLists.txt create mode 100644 karm/support/CMakeLists.txt create mode 100644 kfile-plugins/CMakeLists.txt create mode 100644 kfile-plugins/ics/CMakeLists.txt create mode 100644 kfile-plugins/vcf/CMakeLists.txt create mode 100644 kmailcvt/CMakeLists.txt create mode 100644 kmailcvt/pics/CMakeLists.txt create mode 100644 konsolekalendar/CMakeLists.txt create mode 100644 konsolekalendar/pixmaps/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a58b4f0..01869c97 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,6 +97,11 @@ option( BUILD_KNOTES "Build knotes" ${BUILD_ALL} ) option( BUILD_KODE "Build kode" ${BUILD_ALL} ) option( BUILD_KRESOURCES "Build kresources" ${BUILD_ALL} ) option( BUILD_WIZARDS "Build wizards" ${BUILD_ALL} ) +option( BUILD_KABC "Build kabc" ${BUILD_ALL} ) +option( BUILD_KONSOLEKALENDAR "Build konsolekalendar" ${BUILD_ALL} ) +option( BUILD_KMAILCVT "Build kmailcvt" ${BUILD_ALL} ) +option( BUILD_KARM "Build karm" ${BUILD_ALL} ) +option( BUILD_KFILE_PLUGINS "Build kfile-plugins" ${BUILD_ALL} ) ##### configure checks ########################## @@ -156,6 +161,11 @@ tde_conditional_add_subdirectory( BUILD_KNOTES knotes ) tde_conditional_add_subdirectory( BUILD_KODE kode ) tde_conditional_add_subdirectory( BUILD_KRESOURCES kresources ) tde_conditional_add_subdirectory( BUILD_WIZARDS wizards ) +tde_conditional_add_subdirectory( BUILD_KABC kabc ) +tde_conditional_add_subdirectory( BUILD_KONSOLEKALENDAR konsolekalendar ) +tde_conditional_add_subdirectory( BUILD_KMAILCVT kmailcvt ) +tde_conditional_add_subdirectory( BUILD_KARM karm ) +tde_conditional_add_subdirectory( BUILD_KFILE_PLUGINS kfile-plugins ) ##### write configure files ##################### diff --git a/kabc/CMakeLists.txt b/kabc/CMakeLists.txt new file mode 100644 index 00000000..486dec53 --- /dev/null +++ b/kabc/CMakeLists.txt @@ -0,0 +1,13 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_subdirectory( kabc2mutt ) +tde_conditional_add_subdirectory( WITH_NEWDISTRLISTS kabcdistlistupdater ) diff --git a/kabc/kabc2mutt/CMakeLists.txt b/kabc/kabc2mutt/CMakeLists.txt new file mode 100644 index 00000000..f7ec8dbe --- /dev/null +++ b/kabc/kabc2mutt/CMakeLists.txt @@ -0,0 +1,29 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + + +##### kabc2mutt (executable) #################### + +tde_add_executable( kabc2mutt AUTOMOC + SOURCES kabc2mutt.cpp main.cpp + LINK kabc-shared + DESTINATION ${BIN_INSTALL_DIR} +) diff --git a/kabc/kabcdistlistupdater/CMakeLists.txt b/kabc/kabcdistlistupdater/CMakeLists.txt new file mode 100644 index 00000000..533b11fa --- /dev/null +++ b/kabc/kabcdistlistupdater/CMakeLists.txt @@ -0,0 +1,42 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_import( libkmime ) +tde_import( ktnef ) +tde_import( libkcal ) +tde_import( libkdepim ) + +include_directories( + ${CMAKE_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + + +##### other data ################################ + +install( + FILES kabcdistlistupdater.desktop + DESTINATION ${AUTOSTART_INSTALL_DIR} +) + + +##### kabcdistlistupdater (executable) #################### + +tde_add_executable( kabcdistlistupdater + SOURCES kabcdistlistupdater.cpp + LINK kdepim-shared + DESTINATION ${BIN_INSTALL_DIR} +) diff --git a/karm/CMakeLists.txt b/karm/CMakeLists.txt new file mode 100644 index 00000000..4fb6be5a --- /dev/null +++ b/karm/CMakeLists.txt @@ -0,0 +1,82 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_import( libkmime ) +tde_import( ktnef ) +tde_import( libkcal ) +tde_import( libkdepim ) +tde_import( kresources ) + +add_subdirectory( support ) +add_subdirectory( pics ) + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/libkcal + ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/kresources/remote + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + + +##### other data ################################ + +tde_install_icons( karm ) +install( FILES karm_part.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES uninstall.desktop RENAME karm.desktop DESTINATION ${APPS_INSTALL_DIR}/Utilities ) +install( FILES karmui.rc DESTINATION ${DATA_INSTALL_DIR}/karm ) +install( FILES karmui.rc DESTINATION ${DATA_INSTALL_DIR}/karmpart ) + + +##### karm (static) ############################# + +set( libkarm_SRCS + kaccelmenuwatch.cpp desktoptracker.cpp edittaskdialog.cpp + idletimedetector.cpp printdialog.cpp timekard.cpp karmutility.cpp + ktimewidget.cpp karmstorage.cpp mainwindow.cpp preferences.cpp + print.cpp task.cpp taskview.cpp tray.cpp csvexportdialog_base.ui + csvexportdialog.cpp plannerparser.cpp karmdcopiface.skel + taskviewwhatsthis.cpp +) + +tde_add_library( karm_pic STATIC_PIC AUTOMOC + SOURCES ${libkarm_SRCS} +) + +tde_add_library( karm_nopic STATIC AUTOMOC + SOURCES ${libkarm_SRCS} +) + + +##### libkarmpart (module) ###################### + +tde_add_kpart( libkarmpart AUTOMOC + SOURCES karm_part.cpp + LINK karm_pic-static kcal_resourceremote-shared + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### karm (executable) ######################### + +tde_add_executable( karm + SOURCES main.cpp + LINK karm_nopic-static kcal_resourceremote-shared kdeprint-shared + DESTINATION ${BIN_INSTALL_DIR} +) diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp index d44c4ac1..85259fe8 100644 --- a/karm/karm_part.cpp +++ b/karm/karm_part.cpp @@ -322,7 +322,7 @@ bool karmPart::openFile() _taskView->load(m_file); // just for fun, set the status bar - emit seStatusBarText( m_url.prettyURL() ); + emit setStatusBarText( m_url.prettyURL() ); return true; } diff --git a/karm/karmstorage.h b/karm/karmstorage.h index d94064f6..af2d3be0 100644 --- a/karm/karmstorage.h +++ b/karm/karmstorage.h @@ -41,7 +41,6 @@ class Preferences; class Task; class TaskView; class HistoryEvent; -class KCal::Todo; /** * Singleton to store/retrieve KArm data to/from persistent storage. diff --git a/karm/pics/CMakeLists.txt b/karm/pics/CMakeLists.txt new file mode 100644 index 00000000..7e890546 --- /dev/null +++ b/karm/pics/CMakeLists.txt @@ -0,0 +1,19 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +install( FILES + filedel.xpm clock.xpm clockedit.xpm empty-watch.xpm watch-0.xpm + watch-1.xpm watch-2.xpm watch-3.xpm watch-4.xpm watch-5.xpm + watch-6.xpm watch-7.xpm active-icon-0.xpm active-icon-1.xpm + active-icon-2.xpm active-icon-3.xpm active-icon-4.xpm + active-icon-5.xpm active-icon-6.xpm active-icon-7.xpm + task-complete.xpm task-incomplete.xpm + DESTINATION ${DATA_INSTALL_DIR}/karm/pics ) diff --git a/karm/support/CMakeLists.txt b/karm/support/CMakeLists.txt new file mode 100644 index 00000000..f0180549 --- /dev/null +++ b/karm/support/CMakeLists.txt @@ -0,0 +1,12 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +install( FILES karm.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) diff --git a/karm/task.h b/karm/task.h index 276b2503..200612ae 100644 --- a/karm/task.h +++ b/karm/task.h @@ -21,8 +21,6 @@ class TQString; class KarmStorage; class TQTimer; -class KCal::Incidence; -class KCal::Todo; class TQObject; class TQPixmap; diff --git a/kfile-plugins/CMakeLists.txt b/kfile-plugins/CMakeLists.txt new file mode 100644 index 00000000..3f9c0f47 --- /dev/null +++ b/kfile-plugins/CMakeLists.txt @@ -0,0 +1,13 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_subdirectory( vcf ) +add_subdirectory( ics ) diff --git a/kfile-plugins/ics/CMakeLists.txt b/kfile-plugins/ics/CMakeLists.txt new file mode 100644 index 00000000..748babcb --- /dev/null +++ b/kfile-plugins/ics/CMakeLists.txt @@ -0,0 +1,39 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_import( libkmime ) +tde_import( ktnef ) +tde_import( libkcal ) + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + + +##### other data ################################ + +install( FILES kfile_ics.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) + + +##### kfile_ics (module) ######################## + +tde_add_kpart( kfile_ics AUTOMOC + SOURCES kfile_ics.cpp + LINK kcal-shared + DESTINATION ${PLUGIN_INSTALL_DIR} +) diff --git a/kfile-plugins/vcf/CMakeLists.txt b/kfile-plugins/vcf/CMakeLists.txt new file mode 100644 index 00000000..114c6da7 --- /dev/null +++ b/kfile-plugins/vcf/CMakeLists.txt @@ -0,0 +1,35 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + + +##### other data ################################ + +install( FILES kfile_vcf.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) + + +##### kfile_vcf (module) ######################## + +tde_add_kpart( kfile_vcf AUTOMOC + SOURCES kfile_vcf.cpp + LINK kabc-shared + DESTINATION ${PLUGIN_INSTALL_DIR} +) diff --git a/kmailcvt/CMakeLists.txt b/kmailcvt/CMakeLists.txt new file mode 100644 index 00000000..26b2ce6b --- /dev/null +++ b/kmailcvt/CMakeLists.txt @@ -0,0 +1,49 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_subdirectory( pics ) + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + + +##### other data ################################ + +tde_install_icons( ) + +install( + FILES uninstall.desktop + RENAME kmailcvt.desktop + DESTINATION ${APPS_INSTALL_DIR}/Utilities ) + + +##### kmailcvt (executable) ##################### + +tde_add_executable( kmailcvt AUTOMOC + SOURCES + kimportpagedlg.ui kimportpage.cpp kselfilterpagedlg.ui + kselfilterpage.cpp filters.cxx filter_oe.cxx kmailcvt.cpp main.cpp + filter_pmail.cxx filter_plain.cxx filter_outlook.cxx filter_mbox.cxx + filter_evolution.cxx filter_mailapp.cxx filter_evolution_v2.cxx + filter_opera.cxx filter_thunderbird.cxx filter_kmail_maildir.cxx + filter_sylpheed.cxx filter_thebat.cxx filter_lnotes.cxx + filter_kmail_archive.cxx + LINK kio-shared + DESTINATION ${BIN_INSTALL_DIR} +) diff --git a/kmailcvt/pics/CMakeLists.txt b/kmailcvt/pics/CMakeLists.txt new file mode 100644 index 00000000..a5c5d237 --- /dev/null +++ b/kmailcvt/pics/CMakeLists.txt @@ -0,0 +1,12 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +install( FILES step1.png DESTINATION ${DATA_INSTALL_DIR}/kmailcvt/pics ) diff --git a/konsolekalendar/CMakeLists.txt b/konsolekalendar/CMakeLists.txt new file mode 100644 index 00000000..63c17f28 --- /dev/null +++ b/konsolekalendar/CMakeLists.txt @@ -0,0 +1,68 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_import( libkmime ) +tde_import( ktnef ) +tde_import( libkcal ) +tde_import( libkdepim ) + +add_subdirectory( pixmaps ) + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + + +##### other data ################################ + +install( FILES konsolekalendar.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) + + +##### 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( ) + + +##### konsolekalendar (executable) ############## + +process_kcfg( konsolekalendar.cpp htmlexportsettings.h libkcal + htmlexportsettings.kcfg htmlexportsettings.kcfgc ) + +tde_add_executable( konsolekalendar AUTOMOC + SOURCES + konsolekalendarepoch.cpp konsolekalendardelete.cpp + konsolekalendarchange.cpp konsolekalendarvariables.cpp + konsolekalendaradd.cpp konsolekalendarexports.cpp konsolekalendar.cpp + stdcalendar.cpp main.cpp + LINK kdepim-shared + DESTINATION ${BIN_INSTALL_DIR} +) diff --git a/konsolekalendar/pixmaps/CMakeLists.txt b/konsolekalendar/pixmaps/CMakeLists.txt new file mode 100644 index 00000000..db8d4480 --- /dev/null +++ b/konsolekalendar/pixmaps/CMakeLists.txt @@ -0,0 +1,12 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_install_icons( )