diff --git a/.github/workflows/build-windows-intel.yml b/.github/workflows/build-windows-intel.yml index c7d70e6a..9c6104bd 100644 --- a/.github/workflows/build-windows-intel.yml +++ b/.github/workflows/build-windows-intel.yml @@ -24,6 +24,7 @@ jobs: - uses: TheMrMilchmann/setup-msvc-dev@v4 with: arch: x64 + toolset: 14.3 - name: Cache SDK Folder uses: actions/cache@v4 diff --git a/cmake/CPackConfig.cmake b/cmake/CPackConfig.cmake index 0f641b61..47f03de9 100644 --- a/cmake/CPackConfig.cmake +++ b/cmake/CPackConfig.cmake @@ -8,36 +8,36 @@ if(CMAKE_BUILD_TYPE STREQUAL "Release") set(CPACK_PACKAGE_CONTACT "${package_contact}") set(CPACK_PACKAGE_HOMEPAGE_URL "${package_website}") - set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/local") # Linux/macOS default - if(WIN32) - set(CPACK_PACKAGING_INSTALL_PREFIX "C:/Program Files/${PROJECT_NAME}") - endif() + #set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/local") # Linux/macOS default + #if(WIN32) + # set(CPACK_PACKAGING_INSTALL_PREFIX "C:/Program Files/${PROJECT_NAME}") + #endif() if(APPLE) if("${package_macos_installer}" STREQUAL "DMG") - set(CPACK_GENERATOR "DragNDrop") + # set(CPACK_GENERATOR "DragNDrop") # set(CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/resources/dmg_background.png") - set(CPACK_DMG_VOLUME_NAME "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION}") - message(STATUS "Registered CPACK_GENERATOR: DragNDrop") + # set(CPACK_DMG_VOLUME_NAME "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION}") + # message(STATUS "Registered CPACK_GENERATOR: DragNDrop") else () - set(CPACK_GENERATOR "productbuild") - set(CPACK_PRODUCTBUILD_IDENTIFIER "${package_macos_pkg_productbuild_identifier}") + # set(CPACK_GENERATOR "productbuild") + # set(CPACK_PRODUCTBUILD_IDENTIFIER "${package_macos_pkg_productbuild_identifier}") # set(CPACK_PRODUCTBUILD_SIGNING_IDENTITY "Developer ID Installer: Your Company (TEAMID)") - message(STATUS "Registered CPACK_GENERATOR: productbuild") + # message(STATUS "Registered CPACK_GENERATOR: productbuild") endif () elseif(WIN32) - set(CPACK_GENERATOR "WIX") - message(STATUS "Registered CPACK_GENERATOR: WIX") + # set(CPACK_GENERATOR "WIX") + # message(STATUS "Registered CPACK_GENERATOR: WIX") # set(CPACK_WIX_PRODUCT_ICON "${CMAKE_SOURCE_DIR}/resources/windows_icon.ico") # set(CPACK_WIX_LICENSE_RTF "${CMAKE_SOURCE_DIR}/LICENSE.rtf") # set(CPACK_WIX_UPGRADE_GUID "D3F5A9C1-4B2E-4F5A-9C71-123456789ABC") # change once per major version else() - set(CPACK_GENERATOR "DEB") - message(STATUS "Registered CPACK_GENERATOR: deb") - set(CPACK_DEBIAN_PACKAGE_MAINTAINER "${package_contact}") - set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.28)") - set(CPACK_DEBIAN_PACKAGE_SECTION "utils") - set(CPACK_DEBIAN_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}") + # set(CPACK_GENERATOR "DEB") + # message(STATUS "Registered CPACK_GENERATOR: deb") + # set(CPACK_DEBIAN_PACKAGE_MAINTAINER "${package_contact}") + # set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.28)") + # set(CPACK_DEBIAN_PACKAGE_SECTION "utils") + # set(CPACK_DEBIAN_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}") # post‑install script (e.g., to register a systemd service) # set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA # "${CMAKE_SOURCE_DIR}/scripts/postinstall.sh")