workflow: msvc ci cd on windows used instead of clang-cl

Author: e-gleba

.github/workflows/cmake-multi-platform.yml

@@ -17,39 +17,46 @@ jobs:
         compiler: [clang]
         include:
           - os: ubuntu-latest
-            compiler: clang
-            c_compiler: clang
-            cxx_compiler: clang++
+            preset: clang-full
           - os: windows-latest
-            compiler: clang
-            c_compiler: clang-cl
-            cxx_compiler: clang-cl
+            preset: msvc-full
 
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install LLVM (Windows)
-        if: matrix.os == 'windows-latest'
-        run: choco install ninja
+      - name: Cache CPM dependencies
+        uses: actions/cache@v4
+        with:
+          path: |
+            ${{ github.workspace }}/_deps
+            ~/.cache/CPM
+          key: cpm-${{ matrix.os }}-${{ hashFiles('CMakeLists.txt', 'cmake/**') }}
+          restore-keys: |
+            cpm-${{ matrix.os }}-
 
       - name: Install Linux deps
         if: matrix.os == 'ubuntu-latest'
         run: |
-          sudo apt-get update
-          sudo apt-get install -y libgl-dev libgles-dev build-essential git make \
-            pkg-config cmake ninja-build gnome-desktop-testing libasound2-dev libpulse-dev \
-            libaudio-dev libjack-dev libsndio-dev libx11-dev libxext-dev \
-            libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev \
-            libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev \
-            libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev fcitx-libs-dev
+          sudo apt-get update -qq
+          sudo apt-get install -y --no-install-recommends \
+          libwayland-dev \
+          libxkbcommon-dev \
+          libegl1-mesa-dev \
+          libgles2-mesa-dev \
+          libgl1-mesa-dev \
+          libdbus-1-dev \
+          libudev-dev \
+          libasound2-dev \
+          ninja-build \
+          clang
 
       - name: Configure CMake
-        run: cmake --workflow --preset clang-full
+        run: cmake --workflow --preset ${{ matrix.preset }}
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.os }}-${{ matrix.compiler }}-package
+          name: ${{ matrix.os }}-${{ matrix.preset }}-package
           path: |
             build/clang/*.tar.gz
             build/clang/*.rpm

CMakePresets.json

@@ -17,9 +17,6 @@
       "cacheVariables": {
         "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
         "CMAKE_COLOR_DIAGNOSTICS": "ON"
-      },
-      "environment": {
-        "NINJA_STATUS": "[%f/%t] "
       }
     },
     {
@@ -40,9 +37,6 @@
         "type": "equals",
         "lhs": "${hostSystemName}",
         "rhs": "Windows"
-      },
-      "cacheVariables": {
-        "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL"
       }
     },
     {
@@ -52,12 +46,7 @@
       "inherits": "base",
       "cacheVariables": {
         "CMAKE_C_COMPILER": "clang",
-        "CMAKE_CXX_COMPILER": "clang++",
-        "CMAKE_CXX_FLAGS": "-Wall -Wextra -Wpedantic"
-      },
-      "environment": {
-        "CC": "clang",
-        "CXX": "clang++"
+        "CMAKE_CXX_COMPILER": "clang++"
       }
     },
     {
@@ -67,12 +56,7 @@
       "inherits": "base",
       "cacheVariables": {
         "CMAKE_C_COMPILER": "gcc",
-        "CMAKE_CXX_COMPILER": "g++",
-        "CMAKE_CXX_FLAGS": "-Wall -Wextra -Wpedantic -fdiagnostics-color=always"
-      },
-      "environment": {
-        "CC": "gcc",
-        "CXX": "g++"
+        "CMAKE_CXX_COMPILER": "g++"
       }
     }
   ],

cmake/pkg/package-config.cmake

@@ -1,5 +1,3 @@
-include(CPack)
-
 set(PROJECT_VENDOR "geugenm")
 set(PROJECT_CONTACT "[email protected]")
 set(PROJECT_LICENSE "GPL-2.0") # Use SPDX identifier (required by DEB/RPM)
@@ -8,7 +6,6 @@ set(PROJECT_GROUP "System")
 # Optional: detect architecture automatically (don't hardcode)
 if(NOT DEFINED PROJECT_ARCH)
     set(PROJECT_ARCH ${CMAKE_SYSTEM_PROCESSOR})
-    # Normalize common names
     if(PROJECT_ARCH STREQUAL "x86_64")
         set(PROJECT_ARCH "amd64") # Debian uses 'amd64'
     elseif(PROJECT_ARCH MATCHES "aarch64|arm64")
@@ -17,75 +14,38 @@ if(NOT DEFINED PROJECT_ARCH)
 endif()
 
 set(PROJECT_ICON_FILE "${CMAKE_CURRENT_LIST_DIR}/icon.png")
-set(PROJECT_LICENSE_FILE "${CMAKE_SOURCE_DIR}/license") # uppercase (convention)
+set(PROJECT_LICENSE_FILE "${CMAKE_SOURCE_DIR}/license")
 set(PROJECT_README_FILE "${CMAKE_SOURCE_DIR}/readme.md")
 
 configure_file("${CMAKE_CURRENT_LIST_DIR}/package.desktop.in"
                "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.desktop" @ONLY)
 
-# Documentation
-install(
-    FILES "${PROJECT_README_FILE}" "${PROJECT_LICENSE_FILE}"
-    DESTINATION "share/doc/${PROJECT_NAME}"
-    COMPONENT documentation
-    PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
-
-# Icon (standard locations)
-install(FILES "${PROJECT_ICON_FILE}" DESTINATION "share/pixmaps"
-        RENAME "${PROJECT_NAME}.png")
-install(FILES "${PROJECT_ICON_FILE}"
-        DESTINATION "share/icons/hicolor/256x256/apps"
-        RENAME "${PROJECT_NAME}.png")
-
-# Desktop entry (Linux GUI menu)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.desktop"
-        DESTINATION "share/applications")
-
-cpack_add_component(
-    documentation
-    DISPLAY_NAME "Documentation"
-    DESCRIPTION "Project README and license"
-    GROUP "Documentation")
-
-# Optional: add 'runtime' component if you have executables
-# cpack_add_component(runtime ...)
-
 # === CPack Core Configuration ===
 set(CPACK_PACKAGE_NAME "${PROJECT_NAME}")
 set(CPACK_PACKAGE_VENDOR "${PROJECT_VENDOR}")
 set(CPACK_PACKAGE_CONTACT "${PROJECT_CONTACT}")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_DESCRIPTION}")
 set(CPACK_PACKAGE_HOMEPAGE_URL "${PROJECT_HOMEPAGE_URL}")
-
-# Use SPDX license (required for DEB/RPM)
 set(CPACK_PACKAGE_LICENSE "${PROJECT_LICENSE}")
-
-# Resources
 set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_LICENSE_FILE}")
 set(CPACK_RESOURCE_FILE_README "${PROJECT_README_FILE}")
 
-# Description file (optional)
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_LIST_DIR}/description.txt")
 if(NOT EXISTS "${CPACK_PACKAGE_DESCRIPTION_FILE}")
-    # Fallback to README
     set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_README_FILE}")
 endif()
 
-# Icon (used by macOS/Windows installers)
 set(CPACK_PACKAGE_ICON "${PROJECT_ICON_FILE}")
 
 # === Generator-Specific Settings ===
 
 # DEB
-set(CPACK_DEBIAN_PACKAGE_MAINTAINER "${PROJECT_CONTACT}")
-set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "${PROJECT_HOMEPAGE_URL}")
-set(CPACK_DEBIAN_PACKAGE_SECTION "devel") # or "games", "utils", etc.
+set(CPACK_DEBIAN_PACKAGE_SECTION "devel")
 set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
 
 # RPM
-set(CPACK_RPM_PACKAGE_LICENSE "${PROJECT_LICENSE}") # SPDX
+set(CPACK_RPM_PACKAGE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
 set(CPACK_RPM_PACKAGE_GROUP "${PROJECT_GROUP}")
-set(CPACK_RPM_PACKAGE_URL "${PROJECT_HOMEPAGE_URL}")
 set(CPACK_RPM_PACKAGE_AUTOREQPROV "yes")
 
 # macOS
@@ -98,3 +58,26 @@ endif()
 set(CPACK_NSIS_MODIFY_PATH ON)
 set(CPACK_NSIS_MUI_ICON "${PROJECT_ICON_FILE}")
 set(CPACK_NSIS_MUI_UNIICON "${PROJECT_ICON_FILE}")
+
+include(CPack)
+
+cpack_add_component(
+    documentation
+    DISPLAY_NAME "Documentation"
+    DESCRIPTION "Project README and license"
+    GROUP "Documentation")
+
+install(
+    FILES "${PROJECT_README_FILE}" "${PROJECT_LICENSE_FILE}"
+    DESTINATION "share/doc/${PROJECT_NAME}"
+    COMPONENT documentation
+    PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+
+install(FILES "${PROJECT_ICON_FILE}" DESTINATION "share/pixmaps"
+        RENAME "${PROJECT_NAME}.png")
+install(FILES "${PROJECT_ICON_FILE}"
+        DESTINATION "share/icons/hicolor/256x256/apps"
+        RENAME "${PROJECT_NAME}.png")
+
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.desktop"
+        DESTINATION "share/applications")

cmake/pkg/package.desktop.in

@@ -3,18 +3,22 @@ Type=Application
 Name=@PROJECT_NAME@
 GenericName=@PROJECT_NAME@
 Comment=@PROJECT_DESCRIPTION@
-Exec=main %F
-Icon=icon
+Exec=@PROJECT_NAME@ %F
+Icon=@PROJECT_NAME@
 Terminal=false
-Categories=Utility;Development;
+Categories=Utility;
 Keywords=cpp;utility;command-line;linux;
 StartupNotify=true
+MimeType=
 Actions=About;Help;
 
+# Required for AppImage/AppCenter compliance
+X-Desktop-File-Install-Version=1.0
+
 [Desktop Action About]
 Name=About @PROJECT_NAME@
-Exec=xdg-open @PROJECT_HOMEPAGE_URL@
+Exec=xdg-open "@PROJECT_HOMEPAGE_URL@"
 
 [Desktop Action Help]
-Name=Get Help
-Exec=xdg-open @PROJECT_HOMEPAGE_URL@
+Name=Get Help Online
+Exec=xdg-open "@PROJECT_HOMEPAGE_URL@"