normalize install header include (fix qt6 build)

CMakeLists.txt

 # SPDX-FileCopyrightText: none
 # SPDX-License-Identifier: BSD-3-Clause
 cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
-set(PIM_VERSION "5.19.40")
+set(PIM_VERSION "5.19.41")
 
 project(Akonadi-Contact VERSION ${PIM_VERSION})
 

serializers/akonadi_serializer_contactgroup.cpp

@@ -7,7 +7,7 @@
 #include "akonadi_serializer_contactgroup.h"
 
 #include <Akonadi/AbstractDifferencesReporter>
-#include <Akonadi/Contact/ContactGroupExpandJob>
+#include <Akonadi/ContactGroupExpandJob>
 #include <Akonadi/Item>
 
 #include <KContacts/ContactGroup>

src/akonadi-contacts/CMakeLists.txt

@@ -201,8 +201,7 @@ endif()
 generate_export_header(KF5AkonadiContact BASE_NAME akonadi-contact)
 
 
-target_include_directories(KF5AkonadiContact INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/Akonadi/Contact;${KDE_INSTALL_INCLUDEDIR_KF}>")
-target_include_directories(KF5AkonadiContact INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/akonadi/contact>")
+target_include_directories(KF5AkonadiContact INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/AkonadiContact>")
 target_include_directories(KF5AkonadiContact PUBLIC "$<BUILD_INTERFACE:${Akonadi-Contact_SOURCE_DIR}/src;${Akonadi-Contact_BINARY_DIR}/src>")
 
 target_link_libraries(KF5AkonadiContact
@@ -260,7 +259,7 @@ ecm_generate_headers(AkonadiContactJob_CamelCase_HEADERS
     OpenEmailAddressJob
     AddContactJob
     REQUIRED_HEADERS AkonadiContactJob_HEADERS
-    PREFIX Akonadi/Contact
+    PREFIX Akonadi
     RELATIVE job
     )
 
@@ -269,7 +268,7 @@ ecm_generate_headers(AkonadiContactRecipients_CamelCase_HEADERS
     RecipientsEditorManager
     RecipientsPickerWidget
     REQUIRED_HEADERS AkonadiContactRecipients_HEADERS
-    PREFIX Akonadi/Contact
+    PREFIX Akonadi
     RELATIVE recipientspicker
     )
 
@@ -301,7 +300,7 @@ ecm_generate_headers(AkonadiContact_CamelCase_HEADERS
     SelectAddressBookDialog
 
     REQUIRED_HEADERS AkonadiContact_HEADERS
-    PREFIX Akonadi/Contact
+    PREFIX Akonadi
     )
 
 ecm_generate_headers(AkonadiContactGrantlee_CamelCase_HEADERS
@@ -314,7 +313,7 @@ ecm_generate_headers(AkonadiContactGrantlee_CamelCase_HEADERS
 
     REQUIRED_HEADERS AkonadiContactGrantlee_HEADERS
     RELATIVE grantlee
-    PREFIX Akonadi/Contact
+    PREFIX Akonadi
 )
 
 install( FILES
@@ -322,7 +321,7 @@ install( FILES
     ${AkonadiContactJob_CamelCase_HEADERS}
     ${AkonadiContactRecipients_CamelCase_HEADERS}
     ${AkonadiContactGrantlee_CamelCase_HEADERS}
-    DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/Akonadi/Contact COMPONENT Devel
+    DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/AkonadiContact/Akonadi COMPONENT Devel
     )
 
 install( FILES
@@ -331,7 +330,7 @@ install( FILES
     ${AkonadiContactRecipients_HEADERS}
     ${AkonadiContactGrantlee_HEADERS}
     ${CMAKE_CURRENT_BINARY_DIR}/akonadi-contact_export.h
-    DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/akonadi/contact COMPONENT Devel
+    DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/AkonadiContact/akonadi COMPONENT Devel
     )
 
 
@@ -370,3 +369,7 @@ if (BUILD_QCH)
     )
 endif()
 
+install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/akonadi-contact_version.h
+  DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/AkonadiContact COMPONENT Devel
+)

src/akonadi-contacts/emailaddressselectionmodel.cpp

@@ -8,7 +8,7 @@
 
 #include "emailaddressselectionmodel.h"
 #include <Akonadi/ChangeRecorder>
-#include <Akonadi/Contact/ContactsTreeModel>
+#include <Akonadi/ContactsTreeModel>
 #include <Akonadi/EntityDisplayAttribute>
 #include <Akonadi/ItemFetchScope>
 #include <Akonadi/Session>

src/akonadi-contacts/grantlee/grantleecontactgroupformatter.cpp

@@ -20,7 +20,7 @@
 #include <KTextTemplate/templateloader.h>
 #endif
 
-#include <Akonadi/Contact/ContactGroupExpandJob>
+#include <Akonadi/ContactGroupExpandJob>
 #include <Akonadi/Item>
 
 #include <KColorScheme>

src/akonadi-contacts/job/addcontactjob.cpp

@@ -5,10 +5,10 @@
 */
 
 #include "addcontactjob.h"
-#include "akonadi/contact/selectaddressbookdialog.h"
+#include "selectaddressbookdialog.h"
 #include <Akonadi/Collection>
 
-#include <Akonadi/Contact/ContactSearchJob>
+#include <Akonadi/ContactSearchJob>
 #include <Akonadi/Item>
 #include <Akonadi/ItemCreateJob>
 #include <KContacts/Addressee>

src/akonadi-contacts/job/addemailaddressjob.cpp

@@ -6,7 +6,7 @@
 */
 
 #include "addemailaddressjob.h"
-#include "akonadi/contact/selectaddressbookdialog.h"
+#include "selectaddressbookdialog.h"
 
 #include <Akonadi/AgentFilterProxyModel>
 #include <Akonadi/AgentInstanceCreateJob>
@@ -16,8 +16,8 @@
 #include <Akonadi/CollectionDialog>
 #include <Akonadi/CollectionFetchJob>
 #include <Akonadi/CollectionFetchScope>
-#include <Akonadi/Contact/ContactEditorDialog>
-#include <Akonadi/Contact/ContactSearchJob>
+#include <Akonadi/ContactEditorDialog>
+#include <Akonadi/ContactSearchJob>
 #include <Akonadi/Item>
 #include <Akonadi/ItemCreateJob>
 #include <KContacts/ContactGroup>

src/akonadi-contacts/job/addemaildisplayjob.cpp

@@ -5,7 +5,7 @@
 */
 
 #include "addemaildisplayjob.h"
-#include "akonadi/contact/selectaddressbookdialog.h"
+#include "selectaddressbookdialog.h"
 
 #include <Akonadi/AgentFilterProxyModel>
 #include <Akonadi/AgentInstanceCreateJob>
@@ -15,8 +15,8 @@
 #include <Akonadi/CollectionDialog>
 #include <Akonadi/CollectionFetchJob>
 #include <Akonadi/CollectionFetchScope>
-#include <Akonadi/Contact/ContactEditorDialog>
-#include <Akonadi/Contact/ContactSearchJob>
+#include <Akonadi/ContactEditorDialog>
+#include <Akonadi/ContactSearchJob>
 #include <Akonadi/ItemCreateJob>
 #include <Akonadi/ItemModifyJob>
 

src/akonadi-contacts/job/openemailaddressjob.cpp

@@ -9,8 +9,8 @@
 #include "job/addemailaddressjob.h"
 
 #include <Akonadi/CollectionDialog>
-#include <Akonadi/Contact/ContactEditorDialog>
-#include <Akonadi/Contact/ContactSearchJob>
+#include <Akonadi/ContactEditorDialog>
+#include <Akonadi/ContactSearchJob>
 #include <Akonadi/Item>
 #include <Akonadi/ItemCreateJob>
 #include <KContacts/Addressee>

src/akonadi-contacts/tests/emailaddressselectionmodeltest.cpp

@@ -5,7 +5,7 @@
 */
 
 #include "emailaddressselectionmodel.h"
-#include <Akonadi/Contact/ContactsTreeModel>
+#include <Akonadi/ContactsTreeModel>
 #include <QTreeView>
 
 #include <QApplication>

src/contact-editor/CMakeLists.txt

@@ -16,7 +16,7 @@ add_library(KF5ContactEditor)
 add_library(KF5::ContactEditor ALIAS KF5ContactEditor)
 
 ecm_setup_version(PROJECT VARIABLE_PREFIX AKONADICONTACT
-    VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/contact-editor_version.h"
+    VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/akonadi-contact-editor_version.h"
     PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ContactEditorConfigVersion.cmake"
     SOVERSION 5
     )
@@ -164,7 +164,7 @@ endif()
 generate_export_header(KF5ContactEditor BASE_NAME contacteditor)
 
 
-target_include_directories(KF5ContactEditor INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/ContactEditor>")
+target_include_directories(KF5ContactEditor INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/AkonadiContactEditor>")
 target_include_directories(KF5ContactEditor PUBLIC "$<BUILD_INTERFACE:${Akonadi-Contact_SOURCE_DIR}/src/contact-editor;${Akonadi-Contact_BINARY_DIR}/src/contact-editor>")
 
 target_link_libraries(KF5ContactEditor
@@ -203,28 +203,28 @@ ecm_generate_headers(ContactEditor_CamelCase_HEADERS
     HEADER_NAMES
     ContactEditorPagePlugin
     REQUIRED_HEADERS ContactEditor_HEADERS
-    PREFIX ContactEditor
+    PREFIX Akonadi
     )
 
 ecm_generate_headers(ContactEditorWidget_CamelCase_HEADERS
     HEADER_NAMES
     CategoriesEditAbstractWidget
     REQUIRED_HEADERS ContactEditorWidget_HEADERS
-    PREFIX ContactEditor
+    PREFIX Akonadi
     RELATIVE editor/widgets/
     )
 
 install( FILES
     ${ContactEditor_CamelCase_HEADERS}
     ${ContactEditorWidget_CamelCase_HEADERS}
-    DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/ContactEditor/ContactEditor COMPONENT Devel
+    DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/AkonadiContactEditor/Akonadi COMPONENT Devel
     )
 
 install( FILES
     ${ContactEditor_HEADERS}
     ${ContactEditorWidget_HEADERS}
     ${CMAKE_CURRENT_BINARY_DIR}/contacteditor_export.h
-    DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/ContactEditor/contacteditor COMPONENT Devel
+    DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/AkonadiContactEditor/akonadi COMPONENT Devel
     )
 
 
@@ -267,4 +267,7 @@ if (BUILD_QCH)
     )
 endif()
 
-
+install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/akonadi-contact-editor_version.h
+  DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/AkonadiContactEditor COMPONENT Devel
+)