Commit b5c50ce0 authored by Laurent Montel's avatar Laurent Montel 😁

move to korganizer it created a circular dependency between package

parent 29318165
......@@ -97,7 +97,6 @@ ecm_generate_headers(CalendarSupport_CamelCase_HEADERS
Plugin
CategoryHierarchyReader
CalendarSingleton
CollectionGeneralPage
MessageWidget
ArchiveDialog
REQUIRED_HEADERS CalendarSupport_HEADERS
......@@ -142,38 +141,6 @@ install(FILES
)
endif()
############# Next target #######################
set(calendarsupportcollectionpage_LIB_SRCS
collectiongeneralpage.cpp
)
add_library(calendarsupportcollectionpage ${calendarsupportcollectionpage_LIB_SRCS})
add_dependencies(calendarsupportcollectionpage KF5::MailCommon)
generate_export_header(calendarsupportcollectionpage BASE_NAME calendarsupportcollectionpage)
target_link_libraries(
calendarsupportcollectionpage
PUBLIC
KF5::AkonadiCore
KF5::MailCommon
PRIVATE
KF5::CalendarCore
KF5::PimCommon
KF5::AkonadiCalendar
)
target_include_directories(calendarsupportcollectionpage PUBLIC "$<BUILD_INTERFACE:${calendarsupport_SOURCE_DIR};${calendarsupport_BINARY_DIR};${Boost_INCLUDE_DIRS}>")
set_target_properties(calendarsupportcollectionpage
PROPERTIES VERSION ${KDEPIM_LIB_VERSION}
SOVERSION ${KDEPIM_LIB_VERSION}
)
install(TARGETS calendarsupportcollectionpage ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
install(FILES calendarplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR})
......
......@@ -152,7 +152,8 @@ install(TARGETS
set(korganizerprivate_LIB_SRCS
${korganizer_common_SRCS}
korgmigrateapplication.cpp
korgmigrateapplication.cpp
collectiongeneralpage.cpp
aboutdata.cpp
actionmanager.cpp
akonadicollectionview.cpp
......@@ -256,8 +257,8 @@ PRIVATE
KF5::IdentityManagement
KF5::KCMUtils
KF5::NewStuff
calendarsupportcollectionpage
KF5::Ldap
KF5::MailCommon
)
target_include_directories(korganizerprivate PUBLIC
......
......@@ -54,7 +54,7 @@
#include <IncidenceEditorsng/IncidenceEditorSettings>
#include <KHolidays/HolidayRegion>
#include <CalendarSupport/CollectionGeneralPage>
#include "collectiongeneralpage.h"
#include <CalendarSupport/CollectionSelection>
#include <CalendarSupport/KCalPrefs>
#include <CalendarSupport/Utils>
......
......@@ -20,7 +20,7 @@
#ifndef CALENDARSUPPORT_COLLECTIONGENERALPAGE_H
#define CALENDARSUPPORT_COLLECTIONGENERALPAGE_H
#include "calendarsupportcollectionpage_export.h"
#include "korganizerprivate_export.h"
#include <CollectionPropertiesPage>
......@@ -35,7 +35,7 @@ class IncidencesForWidget;
namespace CalendarSupport
{
class CALENDARSUPPORTCOLLECTIONPAGE_EXPORT CollectionGeneralPage : public Akonadi::CollectionPropertiesPage
class KORGANIZERPRIVATE_EXPORT CollectionGeneralPage : public Akonadi::CollectionPropertiesPage
{
Q_OBJECT
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment