@@ -184,30 +184,6 @@ jobs:
184184 tar -xf "qbittorrent-release-${{ env.qbt_version }}.tar.gz"
185185 Set-Location "qbittorrent-release-${{ env.qbt_version }}"
186186
187- $fixCode = @"
188- # Forced Global Promotion Hotfix
189- find_package(ZLIB REQUIRED)
190- if(TARGET ZLIB::ZLIB)
191- set_property(TARGET ZLIB::ZLIB PROPERTY IMPORTED_GLOBAL TRUE)
192- endif()
193- find_package(OpenSSL REQUIRED)
194- if(TARGET OpenSSL::SSL)
195- set_property(TARGET OpenSSL::SSL PROPERTY IMPORTED_GLOBAL TRUE)
196- endif()
197- if(TARGET OpenSSL::Crypto)
198- set_property(TARGET OpenSSL::Crypto PROPERTY IMPORTED_GLOBAL TRUE)
199- endif()
200- "@
201-
202- $checkPackagesPath = "cmake/Modules/CheckPackages.cmake"
203- $originalContent = Get-Content $checkPackagesPath -Raw
204- Set-Content $checkPackagesPath -Value ($fixCode + "`n" + $originalContent)
205-
206- $commonConfigPath = "cmake/Modules/CommonConfig.cmake"
207- $commonConfig = Get-Content $commonConfigPath -Raw
208- $commonConfig = $commonConfig -replace "QT_DISABLE_DEPRECATED_UP_TO=0x060500", "QT_DISABLE_DEPRECATED_UP_TO=0x060A00"
209- Set-Content $commonConfigPath -Value $commonConfig
210-
211187 # Ensure the deprecation cutoff applies to every target, including qbt_app.
212188 $env:CXXFLAGS = (($env:CXXFLAGS + " /DQT_DISABLE_DEPRECATED_UP_TO=0x060A00").Trim())
213189
@@ -218,6 +194,9 @@ jobs:
218194 -DCMAKE_MSVC_DEBUG_INFORMATION_FORMAT=ProgramDatabase `
219195 -DCMAKE_PREFIX_PATH="$qtTargetRoot;$hostQtRoot;$vcpkgInstalled" `
220196 -DQT_HOST_PATH="$hostQtRoot" `
197+ -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON `
198+ -DOPENSSL_ROOT_DIR="$vcpkgInstalled" `
199+ -DZLIB_ROOT="$vcpkgInstalled" `
221200 -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" `
222201 -DVCPKG_MANIFEST_MODE=OFF `
223202 -DBOOST_ROOT="$boostRoot" `
@@ -303,9 +282,10 @@ jobs:
303282 throw "qbittorrent.exe was not found after extracting the build artifact"
304283 }
305284
306- New-Item -ItemType Directory -Path (Join-Path $smokeRoot "profile") -Force | Out-Null
285+ $profileDir = Join-Path $smokeRoot "profile"
286+ New-Item -ItemType Directory -Path $profileDir -Force | Out-Null
307287
308- $process = Start-Process -FilePath $exePath -WorkingDirectory $smokeRoot -PassThru
288+ $process = Start-Process -FilePath $exePath -ArgumentList @("--profile=$profileDir") - WorkingDirectory $smokeRoot -PassThru
309289 try {
310290 Wait-Process -Id $process.Id -Timeout 45 -ErrorAction Stop
311291 } catch {
0 commit comments