fix windows build

This commit is contained in:
uncor3
2025-11-12 22:01:08 +00:00
parent 2cb8e1c771
commit 929c02ba1c
2 changed files with 7 additions and 15 deletions
-6
View File
@@ -73,17 +73,11 @@ jobs:
$env:PATH = "$wixToolDir;$env:PATH"
"PATH=$wixToolDir;$env:PATH" | Out-File -FilePath $env:GITHUB_ENV -Append
# Install the UI extension
& "$wixToolDir\wix.exe" extension add WixToolset.UI.wixext/4.0.5
& "$wixToolDir\wix.exe" extension list
# Set environment vars for CPack
"WIX=$(Join-Path $wixToolDir 'wix.exe')" | Out-File -FilePath $env:GITHUB_ENV -Append
# Set the extensions path for CMake/CPack
$extensionsPath = Join-Path $env:USERPROFILE ".wix\extensions"
"CPACK_WIX_EXTENSIONS=$extensionsPath" | Out-File -FilePath $env:GITHUB_ENV -Append
- name: Set PKG_CONFIG environment variable
run: echo "PKG_CONFIG_EXECUTABLE=C:/msys64/mingw64/bin/pkg-config.exe" >> $GITHUB_ENV
+7 -9
View File
@@ -331,11 +331,14 @@ endif()
if(PACKAGE_MANAGER_MANAGED)
target_compile_definitions(iDescriptor PRIVATE PACKAGE_MANAGER_MANAGED)
message(STATUS "Building as package manager managed version, updates will be handled by the package manager")
if(PACKAGE_MANAGER_HINT)
message(STATUS "Configured package manager hint: ${PACKAGE_MANAGER_HINT}")
target_compile_definitions(iDescriptor PRIVATE PACKAGE_MANAGER_HINT=\"${PACKAGE_MANAGER_HINT}\")
else()
target_compile_definitions(iDescriptor PRIVATE PACKAGE_MANAGER_HINT="your package manager")
endif()
endif()
if(PACKAGE_MANAGER_HINT)
message(STATUS "Configured package manager hint: ${PACKAGE_MANAGER_HINT}")
target_compile_definitions(iDescriptor PRIVATE PACKAGE_MANAGER_HINT=\"${PACKAGE_MANAGER_HINT}\")
endif()
target_compile_definitions(iDescriptor PRIVATE
APP_VERSION="${PROJECT_VERSION}"
@@ -449,11 +452,6 @@ if(WIN32)
string(UUID CPACK_WIX_UPGRADE_GUID NAMESPACE "d6c5b4a3-f2e1-d0c9-b8a7-f6e5d4c3b2a1" NAME "${PROJECT_NAME}" TYPE MD5)
set(CPACK_WIX_UI_REF "WixUI_InstallDir")
# Explicitly set the WiX extensions path
if(DEFINED ENV{USERPROFILE})
set(CPACK_WIX_EXTENSIONS "$ENV{USERPROFILE}/.wix/extensions")
endif()
set(CPACK_WIX_INSTALL_SCOPE "perMachine")
set(CPACK_WIX_PROGRAM_MENU_FOLDER "${PROJECT_NAME}")
set(CPACK_PACKAGE_EXECUTABLES "iDescriptor" "iDescriptor")