Refactor application to use Qt6, enhance GUI features, and support x64 Linux in batch runs

.github/workflows/build.yml

@@ -28,17 +28,16 @@ jobs:
       - name: Configure
         shell: pwsh
         run: |
-          cmake -S . -B build `
-              -A x64 `
+          cmake --preset windows-x64 `
               -DVCPKG_TARGET_TRIPLET=x64-windows `
               -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake"
 
       - name: Build
         shell: pwsh
         run: |
-            cmake --build build --config Release --verbose
+          cmake --build --preset windows-x64-release --verbose
 
       - name: Run tests
         shell: pwsh
         run: |
-           ctest --test-dir build --output-on-failure
+          ctest --preset windows-x64-release --output-on-failure

.gitignore

@@ -476,3 +476,6 @@ vcpkg_downloads/
 !CMakeLists.txt
 !**/imgui.ini
 
+/build-ninja
+/CMakeFiles
+/_deps

CMakeLists.txt

@@ -1,21 +1,15 @@
 # CMakeLists.txt for DSFE project (root CMakeLists.txt)
-cmake_minimum_required(VERSION 3.10)
-
-if (POLICY CMP0141)
-  cmake_policy(SET CMP0141 NEW)
-  set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<IF:$<AND:$<C_COMPILER_ID:MSVC>,$<CXX_COMPILER_ID:MSVC>>,$<$<CONFIG:Debug,RelWithDebInfo>:EditAndContinue>,$<$<CONFIG:Debug,RelWithDebInfo>:ProgramDatabase>>")
-endif()
-
+cmake_minimum_required(VERSION 3.17)
 project(DSFE LANGUAGES C CXX)
 
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
 
-# Set common output directories for all targets
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+set(OUTPUT_BASE ${CMAKE_BINARY_DIR})
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_BASE}/bin)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_BASE}/lib)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_BASE}/lib)
 
 include(FetchContent)
 
@@ -27,32 +21,6 @@ FetchContent_Declare(
 )
 FetchContent_MakeAvailable(eigen)
 
-FetchContent_Declare(
-  glfw
-  GIT_REPOSITORY https://github.com/glfw/glfw.git
-  GIT_TAG 3.4
-)
-FetchContent_MakeAvailable(glfw)
-
-# Fetch GLM from GitHub
-FetchContent_Declare(
-  glm
-  GIT_REPOSITORY https://github.com/g-truc/glm.git
-  GIT_TAG 1.0.3
-)
-FetchContent_MakeAvailable(glm)
-
-FetchContent_Declare(
-    assimp
-    GIT_REPOSITORY https://github.com/assimp/assimp.git
-    GIT_TAG  v6.0.4
-)
-
-set(ASSIMP_BUILD_TESTS OFF CACHE BOOL "" FORCE)
-set(ASSIMP_BUILD_ASSIMP_TOOLS OFF CACHE BOOL "" FORCE)
-
-FetchContent_MakeAvailable(assimp)
-
 FetchContent_Declare(
   googletest
   GIT_REPOSITORY https://github.com/google/googletest.git
@@ -62,22 +30,6 @@ FetchContent_Declare(
 set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
 FetchContent_MakeAvailable(googletest)
 
-FetchContent_Declare(
-  imgui
-  GIT_REPOSITORY https://github.com/ocornut/imgui.git
-  GIT_TAG docking
-  GIT_SHALLOW TRUE
-)
-FetchContent_MakeAvailable(imgui)
-
-FetchContent_Declare(
-  implot
-  GIT_REPOSITORY https://github.com/epezent/implot.git
-  GIT_TAG v0.17
-  GIT_SHALLOW TRUE
-)
-FetchContent_MakeAvailable(implot)
-
 FetchContent_Declare(
     nlohmann_json
     GIT_REPOSITORY https://github.com/nlohmann/json.git

CMakePresets.json

@@ -1,81 +1,145 @@
 {
-    "version": 3,
+    "version": 8,
     "configurePresets": [
         {
-            "name": "windows-base",
+            "name": "base",
             "hidden": true,
-            "generator": "Ninja",
             "binaryDir": "${sourceDir}/out/build/${presetName}",
-            "installDir": "${sourceDir}/out/install/${presetName}",
             "cacheVariables": {
-                "CMAKE_C_COMPILER": "cl.exe",
-                "CMAKE_CXX_COMPILER": "cl.exe"
-            },
+                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
+                "DSFE_ENABLE_GUI": "OFF"
+            }
+        },
+        {
+            "name": "base-gui",
+            "hidden": true,
+            "binaryDir": "${sourceDir}/out/build/${presetName}",
+            "cacheVariables": {
+                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
+                "DSFE_ENABLE_GUI": "ON"
+            }
+        },
+        {
+            "name": "windows-x64",
+            "displayName": "Windows x64",
+            "inherits": "base",
             "condition": {
                 "type": "equals",
                 "lhs": "${hostSystemName}",
                 "rhs": "Windows"
-            }
-        },
-        {
-            "name": "x64-debug",
-            "displayName": "x64 Debug",
-            "inherits": "windows-base",
+            },
+            "generator": "Visual Studio 18 2026",
             "architecture": {
                 "value": "x64",
                 "strategy": "external"
-            },
-            "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "Debug"
             }
         },
         {
-            "name": "x64-release",
-            "displayName": "x64 Release",
-            "inherits": "x64-debug",
+            "name": "windows-x64-gui",
+            "displayName": "Windows x64 (GUI)",
+            "inherits": "base-gui",
+            "condition": {
+                "type": "equals",
+                "lhs": "${hostSystemName}",
+                "rhs": "Windows"
+            },
+            "generator": "Visual Studio 18 2026",
             "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "Release"
-            }
-        },
-        {
-            "name": "x86-debug",
-            "displayName": "x86 Debug",
-            "inherits": "windows-base",
+                "CMAKE_PREFIX_PATH": "C:/Qt/6.11.1/msvc2022_64"
+            },
             "architecture": {
-                "value": "x86",
+                "value": "x64",
                 "strategy": "external"
-            },
-            "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "Debug"
             }
         },
         {
-            "name": "x86-release",
-            "displayName": "x86 Release",
-            "inherits": "x86-debug",
+            "name": "linux-x64-debug",
+            "displayName": "Linux x64 Debug",
+            "inherits": "base",
+            "condition": {
+                "type": "equals",
+                "lhs": "${hostSystemName}",
+                "rhs": "Linux"
+            },
+            "generator": "Ninja",
             "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "Release"
+                "CMAKE_BUILD_TYPE": "Debug",
+                "CMAKE_PREFIX_PATH": "/usr/lib/x86_64-linux-gnu/cmake",
+                "HDF5_DIR": "",
+                "CMAKE_IGNORE_PATH": "/mnt/c/Program Files/HDF_Group/HDF5/2.0.0"
+            },
+            "architecture": {
+                "value": "x64",
+                "strategy": "external"
             }
         },
         {
-            "name": "linux-debug",
-            "displayName": "Linux Debug",
-            "generator": "Ninja",
-            "binaryDir": "${sourceDir}/out/build/${presetName}",
-            "installDir": "${sourceDir}/out/install/${presetName}",
-            "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "Debug"
-            },
+            "name": "linux-x64-release",
+            "displayName": "Linux x64 Release",
+            "inherits": "base",
             "condition": {
                 "type": "equals",
                 "lhs": "${hostSystemName}",
                 "rhs": "Linux"
             },
-            "vendor": {
-                "microsoft.com/VisualStudioRemoteSettings/CMake/1.0": {
-                    "sourceDir": "$env{HOME}/.vs/$ms{projectDirName}"
-                }
+            "generator": "Ninja",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release",
+                "CMAKE_PREFIX_PATH": "/usr/lib/x86_64-linux-gnu/cmake",
+                "HDF5_DIR": "",
+                "CMAKE_IGNORE_PATH": "/mnt/c/Program Files/HDF_Group/HDF5/2.0.0"
+            },
+            "architecture": {
+                "value": "x64",
+                "strategy": "external"
             }
         }
+    ],
+    "buildPresets": [
+        {
+            "name": "windows-x64-debug",
+            "configurePreset": "windows-x64",
+            "configuration": "Debug"
+        },
+        {
+            "name": "windows-x64-release",
+            "configurePreset": "windows-x64",
+            "configuration": "Release"
+        },
+        {
+            "name": "windows-x64-gui-debug",
+            "configurePreset": "windows-x64-gui",
+            "configuration": "Debug"
+        },
+        {
+            "name": "windows-x64-gui-release",
+            "configurePreset": "windows-x64-gui",
+            "configuration": "Release"
+        },
+        {
+            "name": "linux-x64-debug",
+            "configurePreset": "linux-x64-debug"
+        },
+        {
+            "name": "linux-x64-release",
+            "configurePreset": "linux-x64-release"
+        }
+    ],
+    "testPresets": [
+        {
+            "name": "windows-x64-release",
+            "configurePreset": "windows-x64",
+            "output": { "outputOnFailure": true }
+        },
+        {
+            "name": "windows-x64-gui-release",
+            "configurePreset": "windows-x64-gui",
+            "output": { "outputOnFailure": true }
+        },
+        {
+            "name": "linux-x64-release",
+            "configurePreset": "linux-x64-release",
+            "output": { "outputOnFailure": true }
+        }
     ]
 }

DSFE_App/CMakeLists.txt

@@ -1,8 +1,7 @@
-# CMakeLists.txt for the DSFE_App project
-cmake_minimum_required(VERSION 3.10)
-project(DSFE_App LANGUAGES C CXX)
-
-# Add projects within the DSFE_App directory
+# CMakeLists.txt for the DSFE_App
 add_subdirectory(DSFE_Core)
-add_subdirectory(DSFE_GUI)
-add_subdirectory(DSFE_Engine)
+option(DSFE_ENABLE_GUI "Enable GUI module" ON)
+if(DSFE_ENABLE_GUI)
+    add_subdirectory(DSFE_GUI)
+endif()
+add_subdirectory(DSFE_Engine)