OpenSource/jellyfin-desktop
1
0 Fork 0
mirror of https://github.com/jellyfin/jellyfin-desktop.git synced 2026-10-26 16:45:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1224 from npinto97/ci/fix-windows-msvc-path

Browse Source 
ci: fix Windows MSVC path resolution and Qt configuration
This commit is contained in:
Niels van Velzen authored and GitHub committed 2026-08-11 20:26:52 +02:00
2 parents a8bab929c8 ab723427c1
commit 9fad78e485
2 files changed
+25 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.github/workflows/build-windows.yml
+20 -3
View File
@@ -72,17 +72,34 @@ jobs:
run: |
mkdir deps
mkdir deps/vcruntime
# Copy from VS 2022 Enterprise installation on runner
$vsRedist = Get-ChildItem "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Redist\MSVC\*\x64\Microsoft.VC143.CRT" | Select-Object -First 1
# Dynamically locate VS installation on runner
$vsPath = & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -property installationPath
if (-not $vsPath) {
$vsPath = (Get-ChildItem "C:\Program Files\Microsoft Visual Studio\*\*" | Where-Object { Test-Path "$_\VC\Redist\MSVC" } | Select-Object -First 1).FullName
}
$vsRedist = Get-ChildItem "$vsPath\VC\Redist\MSVC\*\${{ matrix.vc_redist_arch }}\Microsoft.VC*.CRT" | Select-Object -First 1
if (-not $vsRedist) {
$vsRedist = Get-ChildItem "$vsPath\VC\Redist\MSVC" -Recurse -Filter "Microsoft.VC*.CRT" | Where-Object { $_.FullName -like "*${{ matrix.vc_redist_arch }}*" } | Select-Object -First 1
}
Copy-Item "$vsRedist\*.dll" deps/vcruntime/
# Also grab VCRedist installer for optional system-wide install
Invoke-WebRequest -Uri "https://aka.ms/vs/17/release/vc_redist.x64.exe" -OutFile deps/vc_redist.x64.exe
shell: powershell
- name: Build
run: |
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\${{ matrix.vcvars }}"
set "VS_PATH="
for /f "tokens=*" %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -property installationPath 2^>nul') do set "VS_PATH=%%i"
if not defined VS_PATH (
for /d %%d in ("C:\Program Files\Microsoft Visual Studio\*") do (
for /d %%e in ("%%d\*") do (
if exist "%%e\VC\Auxiliary\Build\${{ matrix.vcvars }}" set "VS_PATH=%%e"
)
)
)
call "%VS_PATH%\VC\Auxiliary\Build\${{ matrix.vcvars }}"
cd build
set PATH=%PATH%;C:\Program Files (x86)\Inno Setup 6;%CD%
set "QT_ROOT_DIR=%QT_ROOT_DIR:\=/%"
cmake -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=output -DQTROOT=%QT_ROOT_DIR% -DMPV_INCLUDE_DIR=mpv/include -DMPV_LIBRARY=mpv/libmpv-2.dll -DCHECK_FOR_UPDATES=ON -DUSE_STATIC_MPVQT=ON ..
lib /def:mpv\mpv.def /out:mpv\libmpv-2.dll.lib /MACHINE:${{ matrix.machine }}
ninja
CMakeModules/QtConfiguration.cmake
+5
View File
@@ -17,6 +17,11 @@ if("${QTROOT}" STREQUAL "")
endforeach()
endif()
if(NOT "${QTROOT}" STREQUAL "")
file(TO_CMAKE_PATH "${QTROOT}" QTROOT)
set(QTROOT "${QTROOT}" CACHE PATH "Qt root directory" FORCE)
endif()
if((NOT IS_DIRECTORY ${QTROOT}) AND (NOT "${QTROOT}" STREQUAL ""))
# Write qt.conf in the Qt depends directory so that the Qt tools can find QML files
set(QTCONFCONTENT "[Paths]