Skip to content

Commit 005f317

Browse files
committed
ci: fix preload file path for cmake top-level includes
1 parent c67dd15 commit 005f317

1 file changed

Lines changed: 18 additions & 16 deletions

File tree

.github/workflows/ci_windows_arm64_native.yaml

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -183,22 +183,24 @@ jobs:
183183
aria2c "$env:QBT_URL"
184184
tar -xf "qbittorrent-release-${{ env.qbt_version }}.tar.gz"
185185
Set-Location "qbittorrent-release-${{ env.qbt_version }}"
186-
187-
$cmakePreloadPath = [System.IO.Path]::GetFullPath("ci-preload.cmake").Replace('\\', '/')
188-
$cmakePreload = @(
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-
) -join "`n"
201-
Set-Content -Path "ci-preload.cmake" -Value $cmakePreload
186+
$qbtSourceDir = (Get-Location).Path
187+
$cmakePreloadFile = Join-Path $qbtSourceDir "ci-preload.cmake"
188+
189+
$cmakePreload = @(
190+
'find_package(ZLIB REQUIRED)'
191+
'if(TARGET ZLIB::ZLIB)'
192+
' set_property(TARGET ZLIB::ZLIB PROPERTY IMPORTED_GLOBAL TRUE)'
193+
'endif()'
194+
'find_package(OpenSSL REQUIRED)'
195+
'if(TARGET OpenSSL::SSL)'
196+
' set_property(TARGET OpenSSL::SSL PROPERTY IMPORTED_GLOBAL TRUE)'
197+
'endif()'
198+
'if(TARGET OpenSSL::Crypto)'
199+
' set_property(TARGET OpenSSL::Crypto PROPERTY IMPORTED_GLOBAL TRUE)'
200+
'endif()'
201+
) -join "`n"
202+
Set-Content -Path $cmakePreloadFile -Value $cmakePreload
203+
$cmakePreloadPath = (Get-Item $cmakePreloadFile).FullName.Replace('\\', '/')
202204
203205
# Ensure the deprecation cutoff applies to every target, including qbt_app.
204206
$env:CXXFLAGS = (($env:CXXFLAGS + " /DQT_DISABLE_DEPRECATED_UP_TO=0x060A00").Trim())

0 commit comments

Comments
 (0)