Rename CMake target prefix from KF5 to KPim

LibKGAPI is not a Framework (yet), but part of KDE PIM, so use
the KPim:: target prefix. That means that KF5::GAPICore is now
KPim::GAPICore etc. The KF5:: aliases as well as KF5GAPI CMake
config files are still present for backwards compatibility, but
will be eventually removed. When using find_package(KF5GAPI),
a deprecation warning is displayed with instructions to switch
to KPimGAPI.

This is in preparation of moving KGAPI into KDE Applications.

13 files changed, 181 insertions, 126 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0387fad..b3092e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.0)
-set(KGAPI_LIB_VERSION "5.4.40")
+set(KGAPI_LIB_VERSION "5.4.41")
 
 project(kgapi VERSION ${KGAPI_LIB_VERSION})
 
@@ -26,7 +26,7 @@ set(KCONTACTS_LIB_VERSION "5.4.40")
 ecm_setup_version(PROJECT
     VARIABLE_PREFIX KGAPI
     VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kgapi_version.h"
-    PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5GAPIConfigVersion.cmake"
+    PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPimGAPIConfigVersion.cmake"
     SOVERSION 5
 )
 
@@ -62,32 +62,62 @@ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
 endif()
 
 ############## CMake Config Files ##############
-message("${CMAKECONFIG_INSTALL_DIR}")
-set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5GAPI")
-
+set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPimGAPI")
+set(KGAPI_KF5_COMPAT FALSE)
 configure_package_config_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/KF5GAPIConfig.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/KF5GAPIConfig.cmake"
+    "${CMAKE_CURRENT_SOURCE_DIR}/KPimGAPIConfig.cmake.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/KPimGAPIConfig.cmake"
     INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
 )
 
 install(FILES
-    "${CMAKE_CURRENT_BINARY_DIR}/KF5GAPIConfig.cmake"
-    "${CMAKE_CURRENT_BINARY_DIR}/KF5GAPIConfigVersion.cmake"
+    "${CMAKE_CURRENT_BINARY_DIR}/KPimGAPIConfig.cmake"
+    "${CMAKE_CURRENT_BINARY_DIR}/KPimGAPIConfigVersion.cmake"
     DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
     COMPONENT Devel
 )
 
-install(EXPORT KF5GAPITargets
+install(EXPORT KPimGAPITargets
     DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
-    FILE KF5GAPITargets.cmake
-    NAMESPACE KF5::
+    FILE KPimGAPITargets.cmake
+    NAMESPACE KPim::
 )
 
 install(FILES
     "${CMAKE_CURRENT_BINARY_DIR}/kgapi_version.h"
-    DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF5}"
+    DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim"
     COMPONENT Devel
 )
 
+
+##
+# TODO: Backwards compatiblity. Remove in next major version
+##
+set(CMAKECONFIG_INSTALL_DIR_KF5 "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5GAPI")
+set(KGAPI_KF5_COMPAT TRUE)
+configure_package_config_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/KPimGAPIConfig.cmake.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/KF5GAPIConfig.cmake"
+    INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR_KF5}
+)
+
+install(FILES
+    "${CMAKE_CURRENT_BINARY_DIR}/KF5GAPIConfig.cmake"
+    DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}"
+    COMPONENT Devel
+)
+install(FILES
+    "${CMAKE_CURRENT_BINARY_DIR}/KPimGAPIConfigVersion.cmake"
+    RENAME "KF5GAPIConfigVersion.cmake"
+    DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}"
+    COMPONENT Devel
+)
+install(EXPORT KPimGAPITargets
+    DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}"
+    FILE KPimGAPITargets.cmake
+    NAMESPACE KF5::
+)
+
+
+
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/KF5GAPIConfig.cmake.in b/KF5GAPIConfig.cmake.in
deleted file mode 100644
index d5bd5ce..0000000
--- a/KF5GAPIConfig.cmake.in
+++ /dev/null
@@ -1,7 +0,0 @@
-@PACKAGE_INIT@
-
-find_dependency(KF5CalendarCore "@KCALENDARCORE_LIB_VERSION@")
-find_dependency(KF5Contacts "@KCONTACTS_LIB_VERSION@")
-
-include("${CMAKE_CURRENT_LIST_DIR}/KF5GAPITargets.cmake")
-
diff --git a/KPimGAPIConfig.cmake.in b/KPimGAPIConfig.cmake.in
new file mode 100644
index 0000000..2f2d530
--- /dev/null
+++ b/KPimGAPIConfig.cmake.in
@@ -0,0 +1,16 @@
+@PACKAGE_INIT@
+
+find_dependency(KF5CalendarCore "@KCALENDARCORE_LIB_VERSION@")
+find_dependency(KF5Contacts "@KCONTACTS_LIB_VERSION@")
+
+if (@KGAPI_KF5_COMPAT@)
+    message(WARNING "\n"
+                    "************* DEPRECATION WARNING *************\n"
+                    "Using find_package(KF5GAPI) and KF5::GAPI* targets is deprecated. "
+                    "Please use find_package(KPimGAPI) and KPim::GAPI* instead. This backwards "
+                    "compatibility will be removed in the next major version.\n"
+                    "***********************************************\n")
+endif()
+
+include("${CMAKE_CURRENT_LIST_DIR}/KPimGAPITargets.cmake")
+
diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index bb90567..abf36d5 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -29,7 +29,7 @@ macro(add_libkgapi2_test _module _testname)
                           Qt5::Test
                           KF5::Contacts
                           KF5::CalendarCore
-                          KF5GAPIDrive)
+                          KPimGAPIDrive)
 endmacro(add_libkgapi2_test)
 
 #LIBKGAPI_TESTS(
diff --git a/src/blogger/CMakeLists.txt b/src/blogger/CMakeLists.txt
index 895c70a..aab9257 100644
--- a/src/blogger/CMakeLists.txt
+++ b/src/blogger/CMakeLists.txt
@@ -48,50 +48,52 @@ ecm_generate_headers(kgapiblogger_CamelCase_HEADERS
     REQUIRED_HEADERS kgapiblogger_HEADERS
 )
 
-add_library(KF5GAPIBlogger
+add_library(KPimGAPIBlogger
     ${kgapiblogger_SRCS}
 )
 
-generate_export_header(KF5GAPIBlogger BASE_NAME kgapiblogger)
+generate_export_header(KPimGAPIBlogger BASE_NAME kgapiblogger)
 
-add_library(KF5::GAPIBlogger ALIAS KF5GAPIBlogger)
-target_include_directories(KF5GAPIBlogger INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI>")
+add_library(KPim::GAPIBlogger ALIAS KPimGAPIBlogger)
+# TODO: Backwards compatibility, remove in next major release
+add_library(KF5::GAPIBlogger ALIAS KPimGAPIBlogger)
+target_include_directories(KPimGAPIBlogger INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI>")
 
-target_link_libraries(KF5GAPIBlogger
+target_link_libraries(KPimGAPIBlogger
 PUBLIC
-    KF5::GAPICore
+    KPim::GAPICore
 PRIVATE
     Qt5::Network
 )
 
-set_target_properties(KF5GAPIBlogger PROPERTIES
+set_target_properties(KPimGAPIBlogger PROPERTIES
     VERSION ${KGAPI_VERSION_STRING}
     SOVERSION ${KGAPI_SOVERSION}
     EXPORT_NAME GAPIBlogger
 )
 
 install(TARGETS
-    KF5GAPIBlogger
-    EXPORT KF5GAPITargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
+    KPimGAPIBlogger
+    EXPORT KPimGAPITargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
 )
 
 install(FILES
     ${kgapiblogger_CamelCase_HEADERS}
-    DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI/KGAPI/Blogger"
+    DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/KGAPI/Blogger"
     COMPONENT Devel
 )
 
 install(FILES
     ${kgapiblogger_HEADERS}
     "${CMAKE_CURRENT_BINARY_DIR}/kgapiblogger_export.h"
-    DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI/kgapi/blogger"
+    DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/kgapi/blogger"
     COMPONENT Devel
 )
 
 ecm_generate_pri_file(BASE_NAME KGAPIBlogger
-    LIB_NAME KF5GAPIBlogger
+    LIB_NAME KPimGAPIBlogger
     DEPS "GAPICore"
-    FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI"
+    FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI"
 )
 
 install(FILES
diff --git a/src/calendar/CMakeLists.txt b/src/calendar/CMakeLists.txt
index 67fc5aa..703cfc9 100644
--- a/src/calendar/CMakeLists.txt
+++ b/src/calendar/CMakeLists.txt
@@ -35,49 +35,51 @@ ecm_generate_headers(kgapicalendar_CamelCase_HEADERS
     REQUIRED_HEADERS kgapicalendar_HEADERS
 )
 
-add_library(KF5GAPICalendar
+add_library(KPimGAPICalendar
     ${kgapicalendar_SRCS}
 )
 
-generate_export_header(KF5GAPICalendar BASE_NAME kgapicalendar)
+generate_export_header(KPimGAPICalendar BASE_NAME kgapicalendar)
 
-add_library(KF5::GAPICalendar ALIAS KF5GAPICalendar)
-target_include_directories(KF5GAPICalendar INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI>")
+add_library(KPim::GAPICalendar ALIAS KPimGAPICalendar)
+# TODO: Backwards compatibility, remove in next major release
+add_library(KF5::GAPICalendar ALIAS KPimGAPICalendar)
+target_include_directories(KPimGAPICalendar INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI>")
 
-target_link_libraries(KF5GAPICalendar
+target_link_libraries(KPimGAPICalendar
 PUBLIC
-    KF5::GAPICore
+    KPim::GAPICore
     KF5::CalendarCore
 )
 
-set_target_properties(KF5GAPICalendar PROPERTIES
+set_target_properties(KPimGAPICalendar PROPERTIES
     VERSION ${KGAPI_VERSION_STRING}
     SOVERSION ${KGAPI_SOVERSION}
     EXPORT_NAME GAPICalendar
 )
 
 install(TARGETS
-    KF5GAPICalendar
-    EXPORT KF5GAPITargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
+    KPimGAPICalendar
+    EXPORT KPimGAPITargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
 )
 
 install(FILES
     ${kgapicalendar_CamelCase_HEADERS}
-    DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI/KGAPI/Calendar"
+    DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/KGAPI/Calendar"
     COMPONENT Devel
 )
 
 install(FILES
     ${kgapicalendar_HEADERS}
     "${CMAKE_CURRENT_BINARY_DIR}/kgapicalendar_export.h"
-    DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI/kgapi/calendar"
+    DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/kgapi/calendar"
     COMPONENT Devel
 )
 
 ecm_generate_pri_file(BASE_NAME KGAPICalendar
-    LIB_NAME KF5GAPICalendar
+    LIB_NAME KPimGAPICalendar
     DEPS "GAPICore CalendarCore"
-    FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI"
+    FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI"
 )
 
 install(FILES
diff --git a/src/contacts/CMakeLists.txt b/src/contacts/CMakeLists.txt
index 472032b..0651119 100644
--- a/src/contacts/CMakeLists.txt
+++ b/src/contacts/CMakeLists.txt
@@ -32,52 +32,54 @@ ecm_generate_headers(kgapicontacts_CamelCase_HEADERS
     REQUIRED_HEADERS kgapicontacts_HEADERS
 )
 
-add_library(KF5GAPIContacts
+add_library(KPimGAPIContacts
     ${kgapicontacts_SRCS}
 )
 
-generate_export_header(KF5GAPIContacts BASE_NAME kgapicontacts)
+generate_export_header(KPimGAPIContacts BASE_NAME kgapicontacts)
 
-add_library(KF5::GAPIContacts ALIAS KF5GAPIContacts)
-target_include_directories(KF5GAPIContacts INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI>")
+add_library(KPim::GAPIContacts ALIAS KPimGAPIContacts)
+# TODO: Backwards compatibility, remove in next major release
+add_library(KF5::GAPIContacts ALIAS KPimGAPIContacts)
+target_include_directories(KPimGAPIContacts INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI>")
 
-target_link_libraries(KF5GAPIContacts
+target_link_libraries(KPimGAPIContacts
 PUBLIC
-    KF5::GAPICore
+    KPim::GAPICore
     KF5::Contacts
 PRIVATE
     Qt5::Xml
     Qt5::Network
 )
 
-set_target_properties(KF5GAPIContacts PROPERTIES
+set_target_properties(KPimGAPIContacts PROPERTIES
     VERSION ${KGAPI_VERSION_STRING}
     SOVERSION ${KGAPI_SOVERSION}
     EXPORT_NAME GAPIContacts
 )
 
 install(TARGETS
-    KF5GAPIContacts
-    EXPORT KF5GAPITargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
+    KPimGAPIContacts
+    EXPORT KPimGAPITargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
 )
 
 install(FILES
     ${kgapicontacts_CamelCase_HEADERS}
-    DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI/KGAPI/Contacts"
+    DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/KGAPI/Contacts"
     COMPONENT Devel
 )
 
 install(FILES
     ${kgapicontacts_HEADERS}
     "${CMAKE_CURRENT_BINARY_DIR}/kgapicontacts_export.h"
-    DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI/kgapi/contacts"
+    DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/kgapi/contacts"
     COMPONENT Devel
 )
 
 ecm_generate_pri_file(BASE_NAME KGAPIContacts
-    LIB_NAME KF5GAPIContacts
-    DEPS "KF5::GAPICore KF5::Contacts Qt5::Xml"
-    FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI"
+    LIB_NAME KPimGAPIContacts
+    DEPS "KPim::GAPICore KF5::Contacts Qt5::Xml"
+    FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI"
 )
 
 install(FILES
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 63ecbe8..1d33472 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -51,16 +51,18 @@ ecm_generate_headers(kgapicore_ui_CamelCase_HEADERS
     RELATIVE ui
 )
 
-add_library(KF5GAPICore
+add_library(KPimGAPICore
     ${kgapicore_SRCS}
 )
 
-generate_export_header(KF5GAPICore BASE_NAME kgapicore)
+generate_export_header(KPimGAPICore BASE_NAME kgapicore)
 
-add_library(KF5::GAPICore ALIAS KF5GAPICore)
-target_include_directories(KF5GAPICore INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI;${KF5_INCLUDE_INSTALL_DIR}/KGAPI/kgapi>")
+add_library(KPim::GAPICore ALIAS KPimGAPICore)
+# TODO: Backwards compatibility, remove in next major release
+add_library(KF5::GAPICore ALIAS KPimGAPICore)
+target_include_directories(KPimGAPICore INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI;${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/kgapi>")
 
-target_link_libraries(KF5GAPICore
+target_link_libraries(KPimGAPICore
 PRIVATE
     KF5::KIOWidgets
     KF5::WindowSystem
@@ -69,22 +71,22 @@ PUBLIC
     Qt5::Widgets
 )
 
-set_target_properties(KF5GAPICore PROPERTIES
+set_target_properties(KPimGAPICore PROPERTIES
     VERSION ${KGAPI_VERSION_STRING}
     SOVERSION ${KGAPI_SOVERSION}
     EXPORT_NAME GAPICore
 )
 
 install(TARGETS
-    KF5GAPICore
-    EXPORT KF5GAPITargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
+    KPimGAPICore
+    EXPORT KPimGAPITargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
 )
 
 install(FILES
     ${kgapicore_base_CamelCase_HEADERS}
     ${kgapicore_accountinfo_CamelCase_HEADERS}
     ${kgapicore_ui_CamelCase_HEADERS}
-    DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI/KGAPI"
+    DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/KGAPI"
     COMPONENT Devel
 )
 
@@ -93,14 +95,14 @@ install(FILES
     ${kgapicore_accountinfo_HEADERS}
     ${kgapicore_ui_HEADERS}
     "${CMAKE_CURRENT_BINARY_DIR}/kgapicore_export.h"
-    DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI/kgapi"
+    DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/kgapi"
     COMPONENT Devel
 )
 
 ecm_generate_pri_file(BASE_NAME KGAPICore
-    LIB_NAME KF5GAPICore
+    LIB_NAME KPimGAPICore
     DEPS "Qt5::Widgets"
-    FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI"
+    FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI"
 )
 
 install(FILES
diff --git a/src/core/utils.cpp b/src/core/utils.cpp
index d7fa81e7..85c4033 100644
--- a/src/core/utils.cpp
+++ b/src/core/utils.cpp
@@ -45,5 +45,5 @@ QString Utils::bool2Str(bool val)
 
 QString Utils::ts2Str(quint64 ts)
 {
-    return QDateTime::fromTime_t(ts, Qt::UTC, 0).toString(Qt::ISODate);
+    return QDateTime::fromTime_t(ts).toUTC().toString(Qt::ISODate);
 }
diff --git a/src/drive/CMakeLists.txt b/src/drive/CMakeLists.txt
index 621a432..d625c43 100644
--- a/src/drive/CMakeLists.txt
+++ b/src/drive/CMakeLists.txt
@@ -86,50 +86,52 @@ ecm_generate_headers(kgapidrive_CamelCase_HEADERS
     REQUIRED_HEADERS kgapidrive_HEADERS
 )
 
-add_library(KF5GAPIDrive
+add_library(KPimGAPIDrive
     ${kgapidrive_SRCS}
 )
 
-generate_export_header(KF5GAPIDrive BASE_NAME kgapidrive)
+generate_export_header(KPimGAPIDrive BASE_NAME kgapidrive)
 
-add_library(KF5::GAPIDrive ALIAS KF5GAPIDrive)
-target_include_directories(KF5GAPIDrive INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI>")
+add_library(KPim::GAPIDrive ALIAS KPimGAPIDrive)
+# TODO: Backwards compatibility, remove in next major release
+add_library(KF5::GAPIDrive ALIAS KPimGAPIDrive)
+target_include_directories(KPimGAPIDrive INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI>")
 
-target_link_libraries(KF5GAPIDrive
+target_link_libraries(KPimGAPIDrive
 PUBLIC
-    KF5::GAPICore
+    KPim::GAPICore
 PRIVATE
     Qt5::Network
 )
 
-set_target_properties(KF5GAPIDrive PROPERTIES
+set_target_properties(KPimGAPIDrive PROPERTIES
     VERSION ${KGAPI_VERSION_STRING}
     SOVERSION ${KGAPI_SOVERSION}
     EXPORT_NAME GAPIDrive
 )
 
 install(TARGETS
-    KF5GAPIDrive
-    EXPORT KF5GAPITargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
+    KPimGAPIDrive
+    EXPORT KPimGAPITargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
 )
 
 install(FILES
     ${kgapidrive_CamelCase_HEADERS}
-    DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI/KGAPI/Drive"
+    DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/KGAPI/Drive"
     COMPONENT Devel
 )
 
 install(FILES
     ${kgapidrive_HEADERS}
     "${CMAKE_CURRENT_BINARY_DIR}/kgapidrive_export.h"
-    DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI/kgapi/drive"
+    DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/kgapi/drive"
     COMPONENT Devel
 )
 
 ecm_generate_pri_file(BASE_NAME KGAPIDrive
-    LIB_NAME KF5GAPIDrive
+    LIB_NAME KPimGAPIDrive
     DEPS "GAPICore"
-    FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI"
+    FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI"
 )
 
 install(FILES
diff --git a/src/latitude/CMakeLists.txt b/src/latitude/CMakeLists.txt
index 6b0a1a3..780dc26 100644
--- a/src/latitude/CMakeLists.txt
+++ b/src/latitude/CMakeLists.txt
@@ -22,51 +22,53 @@ ecm_generate_headers(kgapilatitude_CamelCase_HEADERS
     REQUIRED_HEADERS kgapilatitude_HEADERS
 )
 
-add_library(KF5GAPILatitude
+add_library(KPimGAPILatitude
     ${kgapilatitude_SRCS}
 )
 
-generate_export_header(KF5GAPILatitude BASE_NAME kgapilatitude)
+generate_export_header(KPimGAPILatitude BASE_NAME kgapilatitude)
 
-add_library(KF5::GAPILatitude ALIAS KF5GAPILatitude)
-target_include_directories(KF5GAPILatitude INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI>")
+add_library(KPim::GAPILatitude ALIAS KPimGAPILatitude)
+# TODO: Backwards compatibility, remove in next major release
+add_library(KF5::GAPILatitude ALIAS KPimGAPILatitude)
+target_include_directories(KPimGAPILatitude INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI>")
 
-target_link_libraries(KF5GAPILatitude
+target_link_libraries(KPimGAPILatitude
 PUBLIC
-    KF5::GAPICore
+    KPim::GAPICore
     KF5::Contacts
 PRIVATE
     Qt5::Network
 )
 
-set_target_properties(KF5GAPILatitude PROPERTIES
+set_target_properties(KPimGAPILatitude PROPERTIES
     VERSION ${KGAPI_VERSION_STRING}
     SOVERSION ${KGAPI_SOVERSION}
     EXPORT_NAME GAPILatitude
 )
 
 install(TARGETS
-    KF5GAPILatitude
-    EXPORT KF5GAPITargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
+    KPimGAPILatitude
+    EXPORT KPimGAPITargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
 )
 
 install(FILES
     ${kgapilatitude_CamelCase_HEADERS}
-    DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI/KGAPI/Latitude"
+    DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/KGAPI/Latitude"
     COMPONENT Devel
 )
 
 install(FILES
     ${kgapilatitude_HEADERS}
     "${CMAKE_CURRENT_BINARY_DIR}/kgapilatitude_export.h"
-    DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI/kgapi/latitude"
+    DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/kgapi/latitude"
     COMPONENT Devel
 )
 
 ecm_generate_pri_file(BASE_NAME KGAPILatitude
-    LIB_NAME KF5GAPILatitude
+    LIB_NAME KPimGAPILatitude
     DEPS "GAPICore Contacts"
-    FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI"
+    FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI"
 )
 
 install(FILES
diff --git a/src/staticmaps/CMakeLists.txt b/src/staticmaps/CMakeLists.txt
index eec0420..a51f2fe 100644
--- a/src/staticmaps/CMakeLists.txt
+++ b/src/staticmaps/CMakeLists.txt
@@ -17,51 +17,53 @@ ecm_generate_headers(kgapimaps_CamelCase_HEADERS
     REQUIRED_HEADERS kgapimaps_HEADERS
 )
 
-add_library(KF5GAPIMaps
+add_library(KPimGAPIMaps
     ${kgapimaps_SRCS}
 )
 
-generate_export_header(KF5GAPIMaps BASE_NAME kgapimaps)
+generate_export_header(KPimGAPIMaps BASE_NAME kgapimaps)
 
-add_library(KF5::GAPIMaps ALIAS KF5GAPIMaps)
-target_include_directories(KF5GAPIMaps INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI>")
+add_library(KPim::GAPIMaps ALIAS KPimGAPIMaps)
+# TODO: Backwards compatibility, remove in next major release
+add_library(KF5::GAPIMaps ALIAS KPimGAPIMaps)
+target_include_directories(KPimGAPIMaps INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI>")
 
-target_link_libraries(KF5GAPIMaps
+target_link_libraries(KPimGAPIMaps
 PUBLIC
-    KF5::GAPICore
+    KPim::GAPICore
     KF5::Contacts
 PRIVATE
     Qt5::Network
 )
 
-set_target_properties(KF5GAPIMaps PROPERTIES
+set_target_properties(KPimGAPIMaps PROPERTIES
     VERSION ${KGAPI_VERSION_STRING}
     SOVERSION ${KGAPI_SOVERSION}
     EXPORT_NAME GAPIMaps
 )
 
 install(TARGETS
-    KF5GAPIMaps
-    EXPORT KF5GAPITargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
+    KPimGAPIMaps
+    EXPORT KPimGAPITargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
 )
 
 install(FILES
     ${kgapimaps_CamelCase_HEADERS}
-    DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI/KGAPI/Maps"
+    DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/KGAPI/Maps"
     COMPONENT Devel
 )
 
 install(FILES
     ${kgapimaps_HEADERS}
     "${CMAKE_CURRENT_BINARY_DIR}/kgapimaps_export.h"
-    DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI/kgapi/maps"
+    DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/kgapi/maps"
     COMPONENT Devel
 )
 
 ecm_generate_pri_file(BASE_NAME KGAPIMaps
-    LIB_NAME KF5GAPIMaps
+    LIB_NAME KPimGAPIMaps
     DEPS "GAPICore Contacts"
-    FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI"
+    FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI"
 )
 
 install(FILES
diff --git a/src/tasks/CMakeLists.txt b/src/tasks/CMakeLists.txt
index f07b5f2..69da5ae 100644
--- a/src/tasks/CMakeLists.txt
+++ b/src/tasks/CMakeLists.txt
@@ -32,49 +32,51 @@ ecm_generate_headers(kgapitasks_CamelCase_HEADERS
     REQUIRED_HEADERS kgapitasks_HEADERS
 )
 
-add_library(KF5GAPITasks
+add_library(KPimGAPITasks
     ${kgapitasks_SRCS}
 )
 
-generate_export_header(KF5GAPITasks BASE_NAME kgapitasks)
+generate_export_header(KPimGAPITasks BASE_NAME kgapitasks)
 
-add_library(KF5::GAPITasks ALIAS KF5GAPITasks)
-target_include_directories(KF5GAPITasks INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI>")
+add_library(KPim::GAPITasks ALIAS KPimGAPITasks)
+# TODO: Backwards compatibility, remove in next major release
+add_library(KF5::GAPITasks ALIAS KPimGAPITasks)
+target_include_directories(KPimGAPITasks INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI>")
 
-target_link_libraries(KF5GAPITasks
+target_link_libraries(KPimGAPITasks
 PUBLIC
-    KF5::GAPICore
+    KPim::GAPICore
     KF5::CalendarCore
 )
 
-set_target_properties(KF5GAPITasks PROPERTIES
+set_target_properties(KPimGAPITasks PROPERTIES
     VERSION ${KGAPI_VERSION_STRING}
     SOVERSION ${KGAPI_SOVERSION}
     EXPORT_NAME GAPITasks
 )
 
 install(TARGETS
-    KF5GAPITasks
-    EXPORT KF5GAPITargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
+    KPimGAPITasks
+    EXPORT KPimGAPITargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
 )
 
 install(FILES
     ${kgapitasks_CamelCase_HEADERS}
-    DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI/KGAPI/Tasks"
+    DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/KGAPI/Tasks"
     COMPONENT Devel
 )
 
 install(FILES
     ${kgapitasks_HEADERS}
     "${CMAKE_CURRENT_BINARY_DIR}/kgapitasks_export.h"
-    DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI/kgapi/tasks"
+    DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/kgapi/tasks"
     COMPONENT Devel
 )
 
 ecm_generate_pri_file(BASE_NAME KGAPITasks
-    LIB_NAME KF5GAPITasks
+    LIB_NAME KPimGAPITasks
     DEPS "GAPICore CalendarCore"
-    FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR_KF5}/KGAPI"
+    FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI"
 )
 
 install(FILES