quotient-im · vkrause · Feb 21, 2023
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -75,6 +75,12 @@ set(${PROJECT_NAME}_INSTALL_INCLUDEDIR
         "${CMAKE_INSTALL_INCLUDEDIR}/${INCLUDEDIR_INIT}" CACHE PATH
         "directory to install ${PROJECT_NAME} include files to")
 
+if (${PROJECT_NAME}_INSTALL_INCLUDEDIR STREQUAL ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
+    set(LEGACY_INCLUDE_SEARCH_PATH ${${PROJECT_NAME}_INSTALL_INCLUDEDIR})
+else()
+    message("Not using namespaced include install layout, this is deprecated")
+endif()
+
 # Instruct CMake to run moc automatically when needed.
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
@@ -305,7 +311,8 @@ endif ()
 
 target_include_directories(${PROJECT_NAME} PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/lib>
-    $<INSTALL_INTERFACE:${${PROJECT_NAME}_INSTALL_INCLUDEDIR}>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+    $<INSTALL_INTERFACE:${LEGACY_INCLUDE_SEARCH_PATH}> # TODO this should be added manually in the cmake config file, behind a consumer-controlled switch
 )
 
 target_link_libraries(${PROJECT_NAME} PUBLIC ${Qt}::Core ${Qt}::Network ${Qt}::Gui qt${${Qt}Core_VERSION_MAJOR}keychain)
@@ -343,7 +350,6 @@ endif()
 install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets
         LIBRARY RUNTIME
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        INCLUDES DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDEDIR}
 )
 install(DIRECTORY lib/ DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDEDIR}
         FILES_MATCHING PATTERN "*.h")

diff --git a/gtad/gtad.yaml b/gtad/gtad.yaml
@@ -87,16 +87,17 @@ analyzer:
         +on:
         - /state_event.yaml$/:
             type: StateEventPtr
-            imports: '"events/stateevent.h"'
+            imports: '"../events/stateevent.h"'
         - /(room|client)_event.yaml$/:
             type: RoomEventPtr
-            imports: '"events/roomevent.h"'
+            imports: '"../events/roomevent.h"'
         - /event(_without_room_id)?.yaml$/:
             type: EventPtr
-            imports: '"events/event.h"'
+            imports: '"../events/event.h"'
       - +set:
           # This renderer applies to everything actually $ref'ed
           # (not substituted)
+          # TODO this would need to go up as many levels first as we are currently nested (for the file we are generating, not for $ref!)
           _importRenderer: '"{{#segments}}{{_}}{{#_join}}/{{/_join}}{{/segments}}.h"'
         +on:
         - '/^(\./)?definitions/request_email_validation.yaml$/':
@@ -130,7 +131,7 @@ analyzer:
       - RoomFilter: # A structure inside Filter, same story as with *_filter.yaml
       - OneTimeKeys:
           type: OneTimeKeys
-          imports: '"e2ee/e2ee_common.h"'
+          imports: '"../e2ee/e2ee_common.h"'
       - //: *UseOmittable
     - array:
       - string: QStringList
@@ -139,7 +140,7 @@ analyzer:
         - /^Notification|Result|ChildRoomsChunk$/: "std::vector<{{1}}>"
         - /^StrippedChildStateEvent$|state_event.yaml$/:
             type: StateEvents
-            imports: '"events/stateevent.h"' # For StrippedChildStateEvent
+            imports: '"../events/stateevent.h"' # For StrippedChildStateEvent
         - /(room|client)_event.yaml$/: RoomEvents
         - /event(_without_room_id)?.yaml$/: Events
       - //: "QVector<{{1}}>"

diff --git a/gtad/operation.h.mustache b/gtad/operation.h.mustache
@@ -4,7 +4,7 @@ SPDX-License-Identifier: LGPL-2.1-or-later
 }}{{>preamble}}
 #pragma once
 
-#include "jobs/basejob.h"
+#include "../jobs/basejob.h"
 {{#imports}}
 #include {{_}}{{/imports}}
 {{#operations.producesNonJson?}}

diff --git a/lib/csapi/account-data.h b/lib/csapi/account-data.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include "../jobs/basejob.h"
 
 namespace Quotient {
 

diff --git a/lib/csapi/admin.h b/lib/csapi/admin.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include "../jobs/basejob.h"
 
 namespace Quotient {
 

diff --git a/lib/csapi/administrative_contact.h b/lib/csapi/administrative_contact.h
@@ -4,13 +4,13 @@
 
 #pragma once
 
+#include "../jobs/basejob.h"
+
 #include "csapi/definitions/auth_data.h"
 #include "csapi/definitions/request_email_validation.h"
 #include "csapi/definitions/request_msisdn_validation.h"
 #include "csapi/definitions/request_token_response.h"
 
-#include "jobs/basejob.h"
-
 namespace Quotient {
 
 /*! \brief Gets a list of a user's third party identifiers.

diff --git a/lib/csapi/appservice_room_directory.h b/lib/csapi/appservice_room_directory.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include "../jobs/basejob.h"
 
 namespace Quotient {
 

diff --git a/lib/csapi/banning.h b/lib/csapi/banning.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include "../jobs/basejob.h"
 
 namespace Quotient {
 

diff --git a/lib/csapi/capabilities.h b/lib/csapi/capabilities.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include "../jobs/basejob.h"
 
 namespace Quotient {
 

diff --git a/lib/csapi/content-repo.h b/lib/csapi/content-repo.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include "../jobs/basejob.h"
 
 #include <QtCore/QIODevice>
 #include <QtNetwork/QNetworkReply>

diff --git a/lib/csapi/create_room.h b/lib/csapi/create_room.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include "../jobs/basejob.h"
 
 namespace Quotient {
 

diff --git a/lib/csapi/cross_signing.h b/lib/csapi/cross_signing.h
@@ -4,11 +4,11 @@
 
 #pragma once
 
+#include "../jobs/basejob.h"
+
 #include "csapi/definitions/auth_data.h"
 #include "csapi/definitions/cross_signing_key.h"
 
-#include "jobs/basejob.h"
-
 namespace Quotient {
 
 /*! \brief Upload cross-signing keys.

diff --git a/lib/csapi/device_management.h b/lib/csapi/device_management.h
@@ -4,11 +4,11 @@
 
 #pragma once
 
+#include "../jobs/basejob.h"
+
 #include "csapi/definitions/auth_data.h"
 #include "csapi/definitions/client_device.h"
 
-#include "jobs/basejob.h"
-
 namespace Quotient {
 
 /*! \brief List registered devices for the current user

diff --git a/lib/csapi/directory.h b/lib/csapi/directory.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include "../jobs/basejob.h"
 
 namespace Quotient {
 

diff --git a/lib/csapi/event_context.h b/lib/csapi/event_context.h
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "events/roomevent.h"
-#include "events/stateevent.h"
-#include "jobs/basejob.h"
+#include "../events/roomevent.h"
+#include "../events/stateevent.h"
+#include "../jobs/basejob.h"
 
 namespace Quotient {
 

diff --git a/lib/csapi/filter.h b/lib/csapi/filter.h
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "csapi/definitions/sync_filter.h"
+#include "../jobs/basejob.h"
 
-#include "jobs/basejob.h"
+#include "csapi/definitions/sync_filter.h"
 
 namespace Quotient {
 

diff --git a/lib/csapi/inviting.h b/lib/csapi/inviting.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include "../jobs/basejob.h"
 
 namespace Quotient {
 

diff --git a/lib/csapi/joining.h b/lib/csapi/joining.h
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "csapi/definitions/third_party_signed.h"
+#include "../jobs/basejob.h"
 
-#include "jobs/basejob.h"
+#include "csapi/definitions/third_party_signed.h"
 
 namespace Quotient {
 

diff --git a/lib/csapi/keys.h b/lib/csapi/keys.h
@@ -4,13 +4,12 @@
 
 #pragma once
 
+#include "../e2ee/e2ee_common.h"
+#include "../jobs/basejob.h"
+
 #include "csapi/definitions/cross_signing_key.h"
 #include "csapi/definitions/device_keys.h"
 
-#include "e2ee/e2ee_common.h"
-
-#include "jobs/basejob.h"
-
 namespace Quotient {
 
 /*! \brief Upload end-to-end encryption keys.

diff --git a/lib/csapi/kicking.h b/lib/csapi/kicking.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include "../jobs/basejob.h"
 
 namespace Quotient {
 

diff --git a/lib/csapi/knocking.h b/lib/csapi/knocking.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include "../jobs/basejob.h"
 
 namespace Quotient {
 

diff --git a/lib/csapi/leaving.h b/lib/csapi/leaving.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include "../jobs/basejob.h"
 
 namespace Quotient {
 

diff --git a/lib/csapi/list_joined_rooms.h b/lib/csapi/list_joined_rooms.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include "../jobs/basejob.h"
 
 namespace Quotient {
 

diff --git a/lib/csapi/list_public_rooms.h b/lib/csapi/list_public_rooms.h
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "csapi/definitions/public_rooms_response.h"
+#include "../jobs/basejob.h"
 
-#include "jobs/basejob.h"
+#include "csapi/definitions/public_rooms_response.h"
 
 namespace Quotient {
 

diff --git a/lib/csapi/login.h b/lib/csapi/login.h
@@ -4,11 +4,11 @@
 
 #pragma once
 
+#include "../jobs/basejob.h"
+
 #include "csapi/definitions/user_identifier.h"
 #include "csapi/definitions/wellknown/full.h"
 
-#include "jobs/basejob.h"
-
 namespace Quotient {
 
 /*! \brief Get the supported login types to authenticate users

diff --git a/lib/csapi/logout.h b/lib/csapi/logout.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include "../jobs/basejob.h"
 
 namespace Quotient {
 

diff --git a/lib/csapi/message_pagination.h b/lib/csapi/message_pagination.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "events/roomevent.h"
-#include "jobs/basejob.h"
+#include "../events/roomevent.h"
+#include "../jobs/basejob.h"
 
 namespace Quotient {
 

diff --git a/lib/csapi/notifications.h b/lib/csapi/notifications.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "events/event.h"
-#include "jobs/basejob.h"
+#include "../events/event.h"
+#include "../jobs/basejob.h"
 
 namespace Quotient {
 

diff --git a/lib/csapi/openid.h b/lib/csapi/openid.h
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "csapi/definitions/openid_token.h"
+#include "../jobs/basejob.h"
 
-#include "jobs/basejob.h"
+#include "csapi/definitions/openid_token.h"
 
 namespace Quotient {
 

diff --git a/lib/csapi/peeking_events.h b/lib/csapi/peeking_events.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "events/roomevent.h"
-#include "jobs/basejob.h"
+#include "../events/roomevent.h"
+#include "../jobs/basejob.h"
 
 namespace Quotient {
 

diff --git a/lib/csapi/presence.h b/lib/csapi/presence.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include "../jobs/basejob.h"
 
 namespace Quotient {
 

diff --git a/lib/csapi/profile.h b/lib/csapi/profile.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
+#include "../jobs/basejob.h"
 
 namespace Quotient {