Refact project structure

Author: AlexandrePTJ

.github/workflows/main.yml

@@ -35,3 +35,6 @@ jobs:
 
       - name: Build
         run: cmake --build --preset release
+      
+      - name: Test
+        run: ctest --preset release

CMakeLists.txt

@@ -29,7 +29,7 @@ if (KEMAI_BUILD_LOCAL_DEPENDENCIES)
     CPMAddPackage("gh:Neargye/magic_enum#v0.9.7")
     CPMAddPackage("gh:catchorg/Catch2#v3.8.1")
     CPMAddPackage(URI "gh:gabime/spdlog#v1.17.0" OPTIONS "SPDLOG_FMT_EXTERNAL ON")
-    CPMAddPackage(URI "gh:frankosterfeld/qtkeychain#0.15.0" OPTIONS "BUILD_WITH_QT6 ON" "BUILD_SHARED_LIBS OFF" "BUILD_TRANSLATIONS OFF")
+    CPMAddPackage(URI "gh:frankosterfeld/qtkeychain#0.15.0" OPTIONS "BUILD_WITH_QT6 ON" "BUILD_SHARED_LIBS OFF" "BUILD_TRANSLATIONS OFF" "BUILD_TESTING OFF")
 endif (KEMAI_BUILD_LOCAL_DEPENDENCIES)
 
 # Find dependencies
@@ -47,12 +47,7 @@ file(WRITE ${CMAKE_BINARY_DIR}/version.txt ${PROJECT_VERSION})
 
 # Project code
 include(CTest)
-add_subdirectory(src)
-
-# Tests (opt-in via BUILD_TESTING, default OFF)
-if (BUILD_TESTING)
-    add_subdirectory(tests)
-endif()
+add_subdirectory(code)
 
 # Common package configuration
 set(KEMAI_GUID "88815E44-85A0-469C-9740-B4887D456BAA")

CMakePresets.json

@@ -38,5 +38,15 @@
       "name": "release",
       "configurePreset": "release"
     }
+  ],
+  "testPresets": [
+    {
+      "name": "debug",
+      "configurePreset": "debug"
+    },
+    {
+      "name": "release",
+      "configurePreset": "release"
+    }
   ]
 }

code/CMakeLists.txt

@@ -0,0 +1,5 @@
+add_subdirectory(core)
+add_subdirectory(app)
+if (BUILD_TESTING)
+    add_subdirectory(tests)
+endif()

code/app/CMakeLists.txt

@@ -0,0 +1,79 @@
+project(Kemai)
+
+set(KEMAI_QML_FILES
+        qml/Components/CurrentTimesheetSelectionItem.qml
+        qml/Components/KemaiTextField.qml
+        qml/Components/PrimaryEditButton.qml
+        qml/Components/PrimaryRedButton.qml
+        qml/Components/ProfileComboBox.qml
+        qml/Components/ProfileEntryDelegate.qml
+        qml/Components/ProfileForm.qml
+        qml/Components/TimeEntryDelegate.qml
+        qml/Components/TimesheetHistoryItem.qml
+        qml/Views/LoginView.qml
+        qml/Views/MainView.qml
+        qml/Views/ProfileManagerDialog.qml
+        qml/Main.qml
+        qml/Theme.qml
+)
+
+set(KEMAI_QML_SOURCES
+        context/kemaiContext.cpp
+        context/kemaiContext.h
+        context/sessionContext.cpp
+        context/sessionContext.h
+        context/profileManager.cpp
+        context/profileManager.h
+)
+
+qt_add_executable(${PROJECT_NAME} WIN32 MACOSX_BUNDLE main.cpp)
+
+set_target_properties(${PROJECT_NAME} PROPERTIES
+        WIN32_EXECUTABLE TRUE
+        MACOSX_BUNDLE TRUE
+)
+
+set_source_files_properties(qml/Theme.qml
+        PROPERTIES QT_QML_SINGLETON_TYPE TRUE
+)
+
+qt_add_qml_module(${PROJECT_NAME}
+        URI Kemai
+        QML_FILES ${KEMAI_QML_FILES}
+        SOURCES ${KEMAI_QML_SOURCES}
+)
+
+# qt_add_translations(${PROJECT_NAME}
+#         TS_FILE_DIR translations
+# )
+
+qt_add_resources(
+        ${PROJECT_NAME} "assets"
+        FILES
+        assets/fonts/RaveoVF.ttf
+        assets/images/kimai_logo.svg
+)
+
+qt_add_resources(
+        ${PROJECT_NAME} "controls_conf"
+        FILES "qtquickcontrols2.conf")
+
+target_include_directories(${PROJECT_NAME}
+        PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}/context)
+
+target_compile_definitions(${PROJECT_NAME}
+        PRIVATE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>)
+
+target_link_libraries(${PROJECT_NAME}
+        PRIVATE KemaiCore Qt6::Gui Qt6::Quick spdlog::spdlog)
+
+install(TARGETS ${PROJECT_NAME}
+        BUNDLE DESTINATION .
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
+qt_generate_deploy_qml_app_script(
+        TARGET ${PROJECT_NAME}
+        OUTPUT_SCRIPT deploy_script
+)
+install(SCRIPT ${deploy_script})