From kde-commits Mon Apr 30 23:28:39 2012 From: Allen Winter Date: Mon, 30 Apr 2012 23:28:39 +0000 To: kde-commits Subject: [kdepim-runtime] resources/google: cleaning according to the KDE style Message-Id: <20120430232839.EF3C5A60D6 () git ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=133582866811322 Git commit 32e8f7677a0eca8531602e9f8181e312dde742fd by Allen Winter. Committed on 01/05/2012 at 01:15. Pushed by winterz into branch 'master'. cleaning according to the KDE style M +39 -27 resources/google/calendar/CMakeLists.txt M +27 -15 resources/google/contacts/CMakeLists.txt http://commits.kde.org/kdepim-runtime/32e8f7677a0eca8531602e9f8181e312dde74= 2fd diff --git a/resources/google/calendar/CMakeLists.txt b/resources/google/ca= lendar/CMakeLists.txt index aeeb3aa..dd49ab6 100644 --- a/resources/google/calendar/CMakeLists.txt +++ b/resources/google/calendar/CMakeLists.txt @@ -1,42 +1,54 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") = set(calendarresource_SRCS - calendareditor.cpp - calendarresource.cpp - defaultreminderattribute.cpp - resource_tasks.cpp - resource_events.cpp - settings.cpp - settingsdialog.cpp - tasklisteditor.cpp + calendareditor.cpp + calendarresource.cpp + defaultreminderattribute.cpp + resource_tasks.cpp + resource_events.cpp + settings.cpp + settingsdialog.cpp + tasklisteditor.cpp ) = kde4_add_ui_files(calendarresource_SRCS - ui/settingsdialog.ui - ui/calendar_editor.ui - ui/tasklist_editor.ui) + ui/settingsdialog.ui + ui/calendar_editor.ui + ui/tasklist_editor.ui +) = kde4_add_kcfg_files(calendarresource_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/sett= ingsbase.kcfgc) -kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/settingsbase.kcfg= org.kde.Akonadi.GoogleCalendar.Settings) + +kcfg_generate_dbus_interface( + ${CMAKE_CURRENT_SOURCE_DIR}/settingsbase.kcfg + org.kde.Akonadi.GoogleCalendar.Settings +) + qt4_add_dbus_adaptor(calendarresource_SRCS - ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.GoogleCalendar.Set= tings.xml - ${CMAKE_CURRENT_SOURCE_DIR}/settings.h Settings) + ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.GoogleCalendar.Settings.xml + ${CMAKE_CURRENT_SOURCE_DIR}/settings.h Settings +) + kde4_add_executable(akonadi_googlecalendar_resource RUN_UNINSTALLED ${cale= ndarresource_SRCS}) = target_link_libraries(akonadi_googlecalendar_resource - ${KDEPIMLIBS_AKONADI_LIBS} - ${KDEPIMLIBS_KCAL_LIBS} - ${KDEPIMLIBS_KCALCORE_LIBS} - ${KDEPIMLIBS_KMIME_LIBS} - ${QT_QTCORE_LIBRARY} - ${QT_QTGUI_LIBRARY} - ${QT_QTDBUS_LIBRARY} - ${QT_QTNETWORK_LIBRARY} - ${KDE4_KDECORE_LIBS} - ${KDE4_KDEWEBKIT_LIBS} - ${QJSON_LIBRARIES} - ${LIBKGOOGLE_LIBRARY} + ${KDEPIMLIBS_AKONADI_LIBS} + ${KDEPIMLIBS_KCAL_LIBS} + ${KDEPIMLIBS_KCALCORE_LIBS} + ${KDEPIMLIBS_KMIME_LIBS} + ${QT_QTCORE_LIBRARY} + ${QT_QTGUI_LIBRARY} + ${QT_QTDBUS_LIBRARY} + ${QT_QTNETWORK_LIBRARY} + ${KDE4_KDECORE_LIBS} + ${KDE4_KDEWEBKIT_LIBS} + ${QJSON_LIBRARIES} + ${LIBKGOOGLE_LIBRARY} ) = install(TARGETS akonadi_googlecalendar_resource ${INSTALL_TARGETS_DEFAULT_= ARGS}) -install(FILES googlecalendarresource.desktop DESTINATION "${CMAKE_INSTALL_= PREFIX}/share/akonadi/agents" ) + +install( + FILES googlecalendarresource.desktop + DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents" +) diff --git a/resources/google/contacts/CMakeLists.txt b/resources/google/co= ntacts/CMakeLists.txt index 4ba1650..0f5ae33 100644 --- a/resources/google/contacts/CMakeLists.txt +++ b/resources/google/contacts/CMakeLists.txt @@ -1,29 +1,41 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") = set(contactsresource_SRCS - contactsresource.cpp - settings.cpp - settingsdialog.cpp + contactsresource.cpp + settings.cpp + settingsdialog.cpp ) = kde4_add_ui_files(contactsresource_SRCS ui/settingsdialog.ui ui/groupedito= r.ui) + kde4_add_kcfg_files(contactsresource_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/sett= ingsbase.kcfgc) -kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/settingsbase.kcfg= org.kde.Akonadi.GoogleContacts.Settings) + +kcfg_generate_dbus_interface( + ${CMAKE_CURRENT_SOURCE_DIR}/settingsbase.kcfg + org.kde.Akonadi.GoogleContacts.Settings +) + qt4_add_dbus_adaptor(contactsresource_SRCS - ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.GoogleContacts.Set= tings.xml = - ${CMAKE_CURRENT_SOURCE_DIR}/settings.h Settings) + ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.GoogleContacts.Settings.xml + ${CMAKE_CURRENT_SOURCE_DIR}/settings.h Settings +) + kde4_add_executable(akonadi_googlecontacts_resource RUN_UNINSTALLED ${cont= actsresource_SRCS}) = target_link_libraries(akonadi_googlecontacts_resource - ${KDEPIMLIBS_AKONADI_LIBS} - ${KDEPIMLIBS_KABC_LIBS} - ${QT_QTCORE_LIBRARY} - ${QT_QTDBUS_LIBRARY} - ${QT_QTNETWORK_LIBRARY} - ${KDE4_KDECORE_LIBS} - ${KDE4_KIO_LIBS} - ${LIBKGOOGLE_LIBRARY} + ${KDEPIMLIBS_AKONADI_LIBS} + ${KDEPIMLIBS_KABC_LIBS} + ${QT_QTCORE_LIBRARY} + ${QT_QTDBUS_LIBRARY} + ${QT_QTNETWORK_LIBRARY} + ${KDE4_KDECORE_LIBS} + ${KDE4_KIO_LIBS} + ${LIBKGOOGLE_LIBRARY} ) = install(TARGETS akonadi_googlecontacts_resource ${INSTALL_TARGETS_DEFAULT_= ARGS}) -install(FILES googlecontactsresource.desktop DESTINATION "${CMAKE_INSTALL_= PREFIX}/share/akonadi/agents" ) + +install( + FILES googlecontactsresource.desktop + DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents" +)