diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 35f029c..3077ab4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,125 +1,125 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ) add_subdirectory(declarative) add_subdirectory(plugins) add_subdirectory(widgets) add_subdirectory(backends) ecm_qt_declare_logging_category(KF5People_debug_SRCS HEADER kpeople_debug.h IDENTIFIER KPEOPLE_LOG CATEGORY_NAME kf5.kpeople) add_library (KF5People ${KF5People_debug_SRCS} global.cpp metacontact.cpp persondata.cpp matchessolver.cpp match.cpp duplicatesfinder.cpp personsmodel.cpp personpluginmanager.cpp personmanager.cpp personssortfilterproxymodel.cpp resources.qrc ) add_library(KF5::People ALIAS KF5People) target_link_libraries (KF5People PUBLIC Qt5::Gui PRIVATE Qt5::Sql KF5::I18n KF5::CoreAddons KF5::PeopleBackend ) if(NOT ANDROID) target_link_libraries(KF5People PRIVATE Qt5::DBus) endif() set_target_properties (KF5People PROPERTIES VERSION ${KPEOPLE_VERSION_STRING} SOVERSION ${KPEOPLE_SOVERSION} EXPORT_NAME People) target_include_directories (KF5People PUBLIC "$" INTERFACE "$" ) if (MSVC) set_target_properties (KF5People PROPERTIES OUTPUT_NAME libkpeople ) endif (MSVC) # Install: install (TARGETS KF5People EXPORT KPeopleTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} ) ecm_generate_headers(KPeople_CamelCase_HEADERS HEADER_NAMES PersonData PersonPluginManager PersonsModel Global REQUIRED_HEADERS KPeople_HEADERS PREFIX KPeople ) install (FILES ${KPeople_CamelCase_HEADERS} DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KPeople/KPeople COMPONENT Devel ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kpeople/kpeople_export.h ${KPeople_HEADERS} DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KPeople/kpeople COMPONENT Devel ) generate_export_header(KF5People EXPORT_FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}/kpeople/kpeople_export.h BASE_NAME KPeople) if(BUILD_QCH) ecm_add_qch( KF5People_QCH NAME KPeople BASE_NAME KF5People VERSION ${KF5_VERSION} ORG_DOMAIN org.kde SOURCES # using only public headers, to cover only public API ${KPeople_HEADERS} ${KPeopleWidgets_QCH_SOURCES} ${KPeopleBackend_QCH_SOURCES} MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md" LINK_QCHS Qt5Gui_QCH Qt5Widgets_QCH BLANK_MACROS KPEOPLE_EXPORT KPEOPLE_DEPRECATED KPEOPLE_DEPRECATED_EXPORT KPEOPLEWIDGETS_EXPORT KPEOPLEWIDGETS_DEPRECATED KPEOPLEWIDGETS_DEPRECATED_EXPORT KPEOPLEBACKEND_EXPORT KPEOPLEBACKEND_DEPRECATED KPEOPLEBACKEND_DEPRECATED_EXPORT TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} COMPONENT Devel ) endif() install (FILES kpeople_data_source.desktop kpeople_plugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) -ecm_generate_pri_file(BASE_NAME KPeople LIB_NAME KF5ConfigCore DEPS "gui" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KPeople) +ecm_generate_pri_file(BASE_NAME KPeople LIB_NAME KF5People DEPS "gui" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KPeople) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) if (ANDROID) install(FILES KF5People-android-dependencies.xml DESTINATION ${KDE_INSTALL_LIBDIR}) endif() diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index deae2cd..c542c99 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -1,79 +1,79 @@ # add_subdirectory(plugins) set (kpeople_widgets_SRCS persondetailsdialog.cpp persondetailsview.cpp persondetailsdialog.cpp plugins/emaildetailswidget.cpp abstractfieldwidgetfactory.cpp actions.cpp mergedialog.cpp mergedelegate.cpp ) ecm_qt_declare_logging_category(kpeople_widgets_SRCS HEADER kpeople_widgets_debug.h IDENTIFIER KPEOPLE_WIDGETS_LOG CATEGORY_NAME kf5.kpeople.widgets) qt5_wrap_ui (kpeople_widgets_SRCS person-details-presentation.ui) add_library (KF5PeopleWidgets SHARED ${kpeople_widgets_SRCS} ) add_library (KF5::PeopleWidgets ALIAS KF5PeopleWidgets) target_link_libraries (KF5PeopleWidgets PUBLIC KF5::People Qt5::Widgets PRIVATE KF5::I18n KF5::ItemViews KF5::WidgetsAddons KF5::PeopleBackend KF5::CoreAddons ) set_target_properties (KF5PeopleWidgets PROPERTIES VERSION ${KPEOPLE_VERSION_STRING} SOVERSION ${KPEOPLE_SOVERSION} EXPORT_NAME PeopleWidgets) if (MSVC) set_target_properties (KF5PeopleWidgets PROPERTIES OUTPUT_NAME libKPeopleWidgets ) endif (MSVC) # Install: install (TARGETS KF5PeopleWidgets EXPORT KPeopleTargets ${INSTALL_TARGETS_DEFAULT_ARGS} ) ecm_generate_headers(KPeopleWidgets_CamelCase_HEADERS HEADER_NAMES AbstractFieldWidgetFactory PersonDetailsView MergeDialog PersonDetailsDialog Actions REQUIRED_HEADERS KPeopleWidgets_HEADERS PREFIX KPeople/Widgets ) install (FILES ${KPeopleWidgets_CamelCase_HEADERS} DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KPeople/KPeople/Widgets COMPONENT Devel ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kpeople/widgets/kpeoplewidgets_export.h ${KPeopleWidgets_HEADERS} DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KPeople/kpeople/widgets COMPONENT Devel ) generate_export_header(KF5PeopleWidgets EXPORT_FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}/kpeople/widgets/kpeoplewidgets_export.h BASE_NAME KPeopleWidgets) install (FILES persondetailsplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) -ecm_generate_pri_file(BASE_NAME KPeopleWidgets LIB_NAME KF5ConfigCore DEPS "widgets KPeople" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KPeople) +ecm_generate_pri_file(BASE_NAME KPeopleWidgets LIB_NAME KF5PeopleWidgets DEPS "widgets KPeople" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KPeople) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) # make available to ecm_add_qch in parent folder set(KPeopleWidgets_QCH_SOURCES ${KPeopleWidgets_HEADERS} PARENT_SCOPE)