CMakeLists.txt: add .h files to sources

This is driven by the change in the way Qt Creator 6 works with CMake
(see https://www.qt.io/blog/qt-creator-6-cmake-update) that basically
requires you to explicitly add header files as source files. While this
obviously added to the size of the source files list, it also drove
dropping the repeated file(GLOB_RECURSE ... CONFIGURE_DEPENDS) call
which added a considerable speedbump to the beginning of each build
(now that call is just one).

1 files changed, 60 insertions, 71 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca92699c..d1dcc106 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -125,54 +125,53 @@ endif ()
 # Set up source files
 list(APPEND lib_SRCS
     lib/quotient_common.h
-    lib/function_traits.h
-    lib/function_traits.cpp
-    lib/networkaccessmanager.cpp
-    lib/connectiondata.cpp
-    lib/connection.cpp
-    lib/ssosession.cpp
-    lib/logging.cpp
-    lib/room.cpp
-    lib/user.cpp
-    lib/avatar.cpp
-    lib/uri.cpp
-    lib/uriresolver.cpp
-    lib/eventstats.cpp
-    lib/syncdata.cpp
-    lib/settings.cpp
-    lib/networksettings.cpp
-    lib/converters.cpp
-    lib/util.cpp
-    lib/encryptionmanager.cpp
-    lib/eventitem.cpp
-    lib/accountregistry.cpp
-    lib/mxcreply.cpp
-    lib/events/event.cpp
-    lib/events/roomevent.cpp
-    lib/events/stateevent.cpp
-    lib/events/eventcontent.cpp
-    lib/events/roomcreateevent.cpp
-    lib/events/roomtombstoneevent.cpp
-    lib/events/roommessageevent.cpp
-    lib/events/roommemberevent.cpp
-    lib/events/roompowerlevelsevent.cpp
-    lib/events/typingevent.cpp
-    lib/events/receiptevent.cpp
-    lib/events/reactionevent.cpp
-    lib/events/callanswerevent.cpp
-    lib/events/callcandidatesevent.cpp
-    lib/events/callhangupevent.cpp
-    lib/events/callinviteevent.cpp
-    lib/events/directchatevent.cpp
-    lib/events/encryptionevent.cpp
-    lib/events/encryptedevent.cpp
-    lib/events/roomkeyevent.cpp
-    lib/events/stickerevent.cpp
-    lib/jobs/requestdata.cpp
-    lib/jobs/basejob.cpp
-    lib/jobs/syncjob.cpp
-    lib/jobs/mediathumbnailjob.cpp
-    lib/jobs/downloadfilejob.cpp
+    lib/function_traits.h lib/function_traits.cpp
+    lib/networkaccessmanager.h lib/networkaccessmanager.cpp
+    lib/connectiondata.h lib/connectiondata.cpp
+    lib/connection.h lib/connection.cpp
+    lib/ssosession.h lib/ssosession.cpp
+    lib/logging.h lib/logging.cpp
+    lib/room.h lib/room.cpp
+    lib/user.h lib/user.cpp
+    lib/avatar.h lib/avatar.cpp
+    lib/uri.h lib/uri.cpp
+    lib/uriresolver.h lib/uriresolver.cpp
+    lib/eventstats.h lib/eventstats.cpp
+    lib/syncdata.h lib/syncdata.cpp
+    lib/settings.h lib/settings.cpp
+    lib/networksettings.h lib/networksettings.cpp
+    lib/converters.h lib/converters.cpp
+    lib/util.h lib/util.cpp
+    lib/encryptionmanager.h lib/encryptionmanager.cpp
+    lib/eventitem.h lib/eventitem.cpp
+    lib/accountregistry.h lib/accountregistry.cpp
+    lib/mxcreply.h lib/mxcreply.cpp
+    lib/events/event.h lib/events/event.cpp
+    lib/events/roomevent.h lib/events/roomevent.cpp
+    lib/events/stateevent.h lib/events/stateevent.cpp
+    lib/events/eventcontent.h lib/events/eventcontent.cpp
+    lib/events/roomcreateevent.h lib/events/roomcreateevent.cpp
+    lib/events/roomtombstoneevent.h lib/events/roomtombstoneevent.cpp
+    lib/events/roommessageevent.h lib/events/roommessageevent.cpp
+    lib/events/roommemberevent.h lib/events/roommemberevent.cpp
+    lib/events/roompowerlevelsevent.h lib/events/roompowerlevelsevent.cpp
+    lib/events/typingevent.h lib/events/typingevent.cpp
+    lib/events/receiptevent.h lib/events/receiptevent.cpp
+    lib/events/reactionevent.h lib/events/reactionevent.cpp
+    lib/events/callanswerevent.h lib/events/callanswerevent.cpp
+    lib/events/callcandidatesevent.h lib/events/callcandidatesevent.cpp
+    lib/events/callhangupevent.h lib/events/callhangupevent.cpp
+    lib/events/callinviteevent.h lib/events/callinviteevent.cpp
+    lib/events/directchatevent.h lib/events/directchatevent.cpp
+    lib/events/encryptionevent.h lib/events/encryptionevent.cpp
+    lib/events/encryptedevent.h lib/events/encryptedevent.cpp
+    lib/events/roomkeyevent.h lib/events/roomkeyevent.cpp
+    lib/events/stickerevent.h lib/events/stickerevent.cpp
+    lib/jobs/requestdata.h lib/jobs/requestdata.cpp
+    lib/jobs/basejob.h lib/jobs/basejob.cpp
+    lib/jobs/syncjob.h lib/jobs/syncjob.cpp
+    lib/jobs/mediathumbnailjob.h lib/jobs/mediathumbnailjob.cpp
+    lib/jobs/downloadfilejob.h lib/jobs/downloadfilejob.cpp
 )
 
 # Configure API files generation
@@ -217,21 +216,13 @@ if (API_GENERATION_ENABLED)
         message( STATUS "${CLANG_FORMAT} is NOT FOUND; API files won't be reformatted")
     endif ()
 
-    # We use globbing with CONFIGURE_DEPENDS to produce two file lists:
-    # one of all API files for clang-format and another of just .cpp
-    # files to supply for library source files. Since we expect these
-    # file lists to only change due to GTAD invocation, we only use
-    # CONFIGURE_DEPENDS when pre-requisites to update API are met.
-    # Read comments next to each file(GLOB_RECURSE) for caveats.
-    set(add_CONFIGURE_DEPENDS "CONFIGURE_DEPENDS")
-
     set(FULL_CSAPI_SRC_DIR ${ABS_API_DEF_PATH}/client-server)
     file(GLOB_RECURSE API_DEFS RELATIVE ${PROJECT_SOURCE_DIR}
         ${FULL_CSAPI_SRC_DIR}/*.yaml
         ${ABS_API_DEF_PATH}/${ASAPI_DEF_DIR}/*.yaml
         ${ABS_API_DEF_PATH}/${ISAPI_DEF_DIR}/*.yaml
     )
-    add_custom_target(generate-unformatted-api
+    add_custom_target(update-api
         ${ABS_GTAD_PATH} --config ../gtad/gtad.yaml --out ${CSAPI_DIR}
             ${FULL_CSAPI_SRC_DIR}
             old_sync.yaml- room_initial_sync.yaml- # deprecated
@@ -271,21 +262,19 @@ if (API_GENERATION_ENABLED)
 endif()
 add_feature_info(EnableApiCodeGeneration "${API_GENERATION_ENABLED}"
                  "build target update-api")
-if (API_GENERATION_ENABLED)
-    add_feature_info(EnableApiFormatting "${API_FORMATTING_ENABLED}"
-                     "formatting of generated API files with clang-format")
-endif()
-
-# Make no mistake: CMake cannot run gtad first and then populate the list of
-# resulting api_SRCS files. In other words, placing the below statement after
-# the block above will not lead to CMake magically reconfiguring the build
-# after building the update-api target. CONFIGURE_DEPENDS somewhat helps,
-# at least forcing the build system to reevaluate the glob before building
-# the next target. Otherwise, you have to watch out if gtad has created
-# new files and if it has, re-run cmake.
-file(GLOB_RECURSE api_SRCS ${add_CONFIGURE_DEPENDS} ${FULL_CSAPI_DIR}/*.cpp)
 
-add_library(${PROJECT_NAME} ${lib_SRCS} ${api_SRCS})
+# Produce the list of all Matrix API files for building the library. When this
+# list changes (normally after calling GTAD), CONFIGURE_DEPENDS will force
+# the build system to call CMake again. Checking for the glob change slows down
+# each build (even if the target does not involve API generation). It would be
+# ideal if GTAD could compare the initial (saved somewhere) and the generated
+# file list itself and write down to some .cmake file if those are different,
+# which would trigger the reconfiguration specifically before the next build.
+# For now CONFIGURE_DEPENDS is the best approximation of that.
+file(GLOB_RECURSE api_ALL_SRCS CONFIGURE_DEPENDS
+     ${FULL_CSAPI_DIR}/*.* lib/${ASAPI_DEF_DIR}/*.* lib/${ISAPI_DEF_DIR}/*.*)
+
+add_library(${PROJECT_NAME} ${lib_SRCS} ${api_ALL_SRCS})
 target_compile_definitions(${PROJECT_NAME} PRIVATE QT_NO_JAVA_STYLE_ITERATORS QT_NO_URL_CAST_FROM_STRING QT_NO_CAST_TO_ASCII)
 
 target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_NAME}_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}