Commit 746d587a authored by Volker Krause's avatar Volker Krause
Browse files

Rename library/target to KF5::DAV

Summary: Prepares this for the move to Frameworks after 20.04.

Reviewers: #kde_pim, mlaurent

Reviewed By: #kde_pim, mlaurent

Subscribers: mlaurent, cgiboudeaux, kde-pim

Tags: #kde_pim

Differential Revision: https://phabricator.kde.org/D26762
parent b6f36281
......@@ -43,31 +43,31 @@ add_definitions(-DQT_NO_FOREACH)
ecm_setup_version(${LIBKDAV_VERSION} VARIABLE_PREFIX KDAV
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kpimkdav_version.h"
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPimKDAVConfigVersion.cmake"
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kdav_version.h"
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5DAVConfigVersion.cmake"
SOVERSION 5
)
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPimKDAV")
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5DAV")
configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/KPimKDAVConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/KPimKDAVConfig.cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/KF5DAVConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/KF5DAVConfig.cmake"
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
)
install(FILES
"${CMAKE_CURRENT_BINARY_DIR}/KPimKDAVConfig.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/KPimKDAVConfigVersion.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/KF5DAVConfig.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/KF5DAVConfigVersion.cmake"
DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
COMPONENT Devel
)
install(EXPORT KPimKDAVTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KPimKDAVTargets.cmake NAMESPACE KPim::)
install(EXPORT KF5DAVTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5DAVTargets.cmake NAMESPACE KF5::)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/kpimkdav_version.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim COMPONENT Devel
${CMAKE_CURRENT_BINARY_DIR}/kdav_version.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KF5 COMPONENT Devel
)
install(FILES kdav.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
......
......@@ -3,4 +3,4 @@
include(CMakeFindDependencyMacro)
find_dependency(KF5CoreAddons "@KF5_MIN_VERSION@")
include("${CMAKE_CURRENT_LIST_DIR}/KPimKDAVTargets.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/KF5DAVTargets.cmake")
......@@ -4,29 +4,29 @@ add_definitions(-DAUTOTEST_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data")
ecm_add_test(davcollectiontest.cpp
TEST_NAME davcollection
NAME_PREFIX "kdav-"
LINK_LIBRARIES KPim::KDAV Qt5::Test Qt5::Core Qt5::Gui
LINK_LIBRARIES KF5::DAV Qt5::Test Qt5::Core Qt5::Gui
)
ecm_add_test(davitemtest.cpp
TEST_NAME davitem
NAME_PREFIX "kdav-"
LINK_LIBRARIES KPim::KDAV Qt5::Test Qt5::Core
LINK_LIBRARIES KF5::DAV Qt5::Test Qt5::Core
)
ecm_add_test(davurltest.cpp
TEST_NAME davurl
NAME_PREFIX "kdav-"
LINK_LIBRARIES KPim::KDAV Qt5::Test Qt5::Core
LINK_LIBRARIES KF5::DAV Qt5::Test Qt5::Core
)
ecm_add_test(davitemfetchjobtest.cpp fakeserver.cpp
TEST_NAME davitemfetchjob
NAME_PREFIX "kdav-"
LINK_LIBRARIES KPim::KDAV Qt5::Test Qt5::Core Qt5::Network
LINK_LIBRARIES KF5::DAV Qt5::Test Qt5::Core Qt5::Network
)
ecm_add_test(davitemslistjobtest.cpp fakeserver.cpp
TEST_NAME davitemslistjob
NAME_PREFIX "kdav-"
LINK_LIBRARIES KPim::KDAV Qt5::Test Qt5::Core Qt5::Network
LINK_LIBRARIES KF5::DAV Qt5::Test Qt5::Core Qt5::Network
)
......@@ -8,9 +8,9 @@ portingAid: false
deprecated: false
release: false
libraries:
- qmake: PimKDAV
cmake: "KPimKDAV"
cmakename: KPimKDAV
- qmake: KDAV
cmake: "KF5DAV"
cmakename: KF5DAV
public_lib: true
group: kdepim
......@@ -70,20 +70,20 @@ ecm_generate_headers(KDAV_Camelcase_HEADERS
install(FILES
${KDAV_Camelcase_HEADERS}
DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim/KDAV
DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KF5/KDAV
COMPONENT Devel
)
install(FILES
${KDAV_HEADERS}
${CMAKE_CURRENT_BINARY_DIR}/kpimkdav_export.h
${CMAKE_CURRENT_BINARY_DIR}/kdav_export.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim/kdav
DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KF5/kdav
COMPONENT Devel
)
ecm_generate_pri_file(BASE_NAME kdav
LIB_NAME KPimKDAV
LIB_NAME KF5DAV
FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR}/KDAV
)
......@@ -94,15 +94,15 @@ install(FILES
ecm_qt_declare_logging_category(libkdav_SRCS HEADER libkdav_debug.h IDENTIFIER KDAV_LOG CATEGORY_NAME org.kde.pim.kdav)
add_library(KPimKDAV
add_library(KF5DAV
${libkdav_SRCS}
)
generate_export_header(KPimKDAV BASE_NAME kpimkdav)
generate_export_header(KF5DAV BASE_NAME kdav)
add_library(KPim::KDAV ALIAS KPimKDAV)
add_library(KF5::DAV ALIAS KF5DAV)
target_link_libraries(KPimKDAV
target_link_libraries(KF5DAV
PUBLIC
KF5::CoreAddons
PRIVATE
......@@ -113,18 +113,17 @@ PRIVATE
KF5::I18n
)
set_target_properties(KPimKDAV PROPERTIES
set_target_properties(KF5DAV PROPERTIES
VERSION ${KDAV_VERSION_STRING}
SOVERSION ${KDAV_SOVERSION}
EXPORT_NAME KDAV
EXPORT_NAME DAV
)
install(TARGETS
KPimKDAV
EXPORT KPimKDAVTargets
KF5DAV
EXPORT KF5DAVTargets
${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
${LIBRARY_NAMELINK}
)
target_include_directories(KPimKDAV INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim/KDAV/;${KDE_INSTALL_INCLUDEDIR}/KPim/kdav;${KDE_INSTALL_INCLUDEDIR}/KPim>")
target_include_directories(KF5DAV INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KF5/KDAV/;${KDE_INSTALL_INCLUDEDIR}/KF5/kdav;${KDE_INSTALL_INCLUDEDIR}/KF5>")
......@@ -18,7 +18,7 @@
#ifndef KDAV_DAVCOLLECTION_H
#define KDAV_DAVCOLLECTION_H
#include "kpimkdav_export.h"
#include "kdav_export.h"
#include "enums.h"
......@@ -41,7 +41,7 @@ namespace KDAV {
* This class is used as container to transfer information about DAV
* collections between the Akonadi resource and the DAV jobs.
*/
class KPIMKDAV_EXPORT DavCollection
class KDAV_EXPORT DavCollection
{
public:
/**
......
......@@ -18,7 +18,7 @@
#ifndef KDAV_DAVCOLLECTIONDELETEJOB_H
#define KDAV_DAVCOLLECTIONDELETEJOB_H
#include "kpimkdav_export.h"
#include "kdav_export.h"
#include "davjobbase.h"
#include "davurl.h"
......@@ -33,7 +33,7 @@ class DavCollectionDeleteJobPrivate;
*
* This job is used to delete a DAV collection at a certain URL.
*/
class KPIMKDAV_EXPORT DavCollectionDeleteJob : public DavJobBase
class KDAV_EXPORT DavCollectionDeleteJob : public DavJobBase
{
Q_OBJECT
......
......@@ -18,7 +18,7 @@
#ifndef KDAV_DAVCOLLECTIONMODIFYJOB_H
#define KDAV_DAVCOLLECTIONMODIFYJOB_H
#include "kpimkdav_export.h"
#include "kdav_export.h"
#include "davjobbase.h"
#include "davurl.h"
......@@ -34,7 +34,7 @@ class DavCollectionModifyJobPrivate;
* This job is used to modify a property of a DAV collection
* on the DAV server.
*/
class KPIMKDAV_EXPORT DavCollectionModifyJob : public DavJobBase
class KDAV_EXPORT DavCollectionModifyJob : public DavJobBase
{
Q_OBJECT
......
......@@ -18,7 +18,7 @@
#ifndef KDAV_DAVCOLLECTIONSFETCHJOB_H
#define KDAV_DAVCOLLECTIONSFETCHJOB_H
#include "kpimkdav_export.h"
#include "kdav_export.h"
#include "davcollection.h"
#include "davjobbase.h"
......@@ -35,7 +35,7 @@ class DavCollectionsFetchJobPrivate;
* This job is used to fetch all DAV collection that are available
* under a certain DAV url.
*/
class KPIMKDAV_EXPORT DavCollectionsFetchJob : public DavJobBase
class KDAV_EXPORT DavCollectionsFetchJob : public DavJobBase
{
Q_OBJECT
......
......@@ -18,7 +18,7 @@
#ifndef KDAV_DAVCOLLECTIONSMULTIFETCHJOB_H
#define KDAV_DAVCOLLECTIONSMULTIFETCHJOB_H
#include "kpimkdav_export.h"
#include "kdav_export.h"
#include "davcollection.h"
#include "davurl.h"
......@@ -39,7 +39,7 @@ class DavCollectionsMultiFetchJobPrivate;
* @note This class just combines multiple calls of DavCollectionsFetchJob
* into one job.
*/
class KPIMKDAV_EXPORT DavCollectionsMultiFetchJob : public KJob
class KDAV_EXPORT DavCollectionsMultiFetchJob : public KJob
{
Q_OBJECT
......
......@@ -18,7 +18,7 @@
#ifndef KDAV_DAVERROR_H
#define KDAV_DAVERROR_H
#include "kpimkdav_export.h"
#include "kdav_export.h"
#include <KJob>
......@@ -49,7 +49,7 @@ enum ErrorNumber {
class ErrorPrivate;
/** DAV operation error. */
class KPIMKDAV_EXPORT Error
class KDAV_EXPORT Error
{
public:
explicit Error();
......
......@@ -18,7 +18,7 @@
#ifndef KDAV_DAVITEM_H
#define KDAV_DAVITEM_H
#include "kpimkdav_export.h"
#include "kdav_export.h"
#include <QByteArray>
#include <QDataStream>
......@@ -42,7 +42,7 @@ namespace KDAV {
* @note While the DAV RFC names them DAV resource we call them items
* to comply to Akonadi terminology.
*/
class KPIMKDAV_EXPORT DavItem
class KDAV_EXPORT DavItem
{
public:
/**
......@@ -114,8 +114,8 @@ private:
QSharedDataPointer<DavItemPrivate> d;
};
KPIMKDAV_EXPORT QDataStream &operator<<(QDataStream &out, const DavItem &item);
KPIMKDAV_EXPORT QDataStream &operator>>(QDataStream &in, DavItem &item);
KDAV_EXPORT QDataStream &operator<<(QDataStream &out, const DavItem &item);
KDAV_EXPORT QDataStream &operator>>(QDataStream &in, DavItem &item);
}
Q_DECLARE_TYPEINFO(KDAV::DavItem, Q_MOVABLE_TYPE);
......
......@@ -18,7 +18,7 @@
#ifndef KDAV_DAVITEMCREATEJOB_H
#define KDAV_DAVITEMCREATEJOB_H
#include "kpimkdav_export.h"
#include "kdav_export.h"
#include "davitem.h"
#include "davjobbase.h"
......@@ -30,7 +30,7 @@ class DavItemCreateJobPrivate;
/**
* @short A job to create a DAV item on the DAV server.
*/
class KPIMKDAV_EXPORT DavItemCreateJob : public DavJobBase
class KDAV_EXPORT DavItemCreateJob : public DavJobBase
{
Q_OBJECT
......
......@@ -18,7 +18,7 @@
#ifndef KDAV_DAVITEMDELETEJOB_H
#define KDAV_DAVITEMDELETEJOB_H
#include "kpimkdav_export.h"
#include "kdav_export.h"
#include "davitem.h"
#include "davjobbase.h"
......@@ -30,7 +30,7 @@ class DavItemDeleteJobPrivate;
/**
* @short A job to delete a DAV item on the DAV server.
*/
class KPIMKDAV_EXPORT DavItemDeleteJob : public DavJobBase
class KDAV_EXPORT DavItemDeleteJob : public DavJobBase
{
Q_OBJECT
......
......@@ -18,7 +18,7 @@
#ifndef KDAV_DAVITEMFETCHJOB_H
#define KDAV_DAVITEMFETCHJOB_H
#include "kpimkdav_export.h"
#include "kdav_export.h"
#include "davitem.h"
#include "davjobbase.h"
......@@ -30,7 +30,7 @@ class DavItemFetchJobPrivate;
/**
* @short A job that fetches a DAV item from the DAV server.
*/
class KPIMKDAV_EXPORT DavItemFetchJob : public DavJobBase
class KDAV_EXPORT DavItemFetchJob : public DavJobBase
{
Q_OBJECT
......
......@@ -18,7 +18,7 @@
#ifndef KDAV_DAVITEMMODIFYJOB_H
#define KDAV_DAVITEMMODIFYJOB_H
#include "kpimkdav_export.h"
#include "kdav_export.h"
#include "davitem.h"
#include "davjobbase.h"
......@@ -30,7 +30,7 @@ class DavItemModifyJobPrivate;
/**
* @short A job that modifies a DAV item on the DAV server.
*/
class KPIMKDAV_EXPORT DavItemModifyJob : public DavJobBase
class KDAV_EXPORT DavItemModifyJob : public DavJobBase
{
Q_OBJECT
......
......@@ -19,7 +19,7 @@
#ifndef KDAV_DAVITEMSFETCHJOB_H
#define KDAV_DAVITEMSFETCHJOB_H
#include "kpimkdav_export.h"
#include "kdav_export.h"
#include "davitem.h"
#include "davjobbase.h"
......@@ -34,7 +34,7 @@ class DavItemsFetchJobPrivate;
/**
* @short A job that fetches a list of items from a DAV server using a multiget query.
*/
class KPIMKDAV_EXPORT DavItemsFetchJob : public DavJobBase
class KDAV_EXPORT DavItemsFetchJob : public DavJobBase
{
Q_OBJECT
......
......@@ -18,7 +18,7 @@
#ifndef KDAV_DAVITEMSLISTJOB_H
#define KDAV_DAVITEMSLISTJOB_H
#include "kpimkdav_export.h"
#include "kdav_export.h"
#include "davitem.h"
#include "davjobbase.h"
......@@ -36,7 +36,7 @@ class DavItemsListJobPrivate;
/**
* @short A job that lists all DAV items inside a DAV collection.
*/
class KPIMKDAV_EXPORT DavItemsListJob : public DavJobBase
class KDAV_EXPORT DavItemsListJob : public DavJobBase
{
Q_OBJECT
......
......@@ -18,7 +18,7 @@
#ifndef KDAV_DAVJOBBASE_H
#define KDAV_DAVJOBBASE_H
#include "kpimkdav_export.h"
#include "kdav_export.h"
#include <KJob>
......@@ -32,7 +32,7 @@ class Error;
/**
* @short base class for the jobs used by the resource.
*/
class KPIMKDAV_EXPORT DavJobBase : public KJob
class KDAV_EXPORT DavJobBase : public KJob
{
Q_OBJECT
......
......@@ -18,7 +18,7 @@
#ifndef KDAV_DAVMULTIGETPROTOCOL_H
#define KDAV_DAVMULTIGETPROTOCOL_H
#include "kpimkdav_export.h"
#include "kdav_export.h"
#include "davprotocolbase_p.h"
......
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