GeezerVison is showing github.com — Update CI script · diffscope/diffscope-project@94311e1
File tree
Expand file treeCollapse file tree
Open diff view settings
Expand file treeCollapse file tree
Open diff view settings
Collapse file
Copy file name to clipboardExpand all lines: scripts/ci/Build.ps1 +3-1Lines changed: 3 additions & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -83,6 +83,7 @@ Write-Host "Semver: $semver" |
83 | 83 | $installerFileBase = "${applicationName}_$($semver -replace '[\.\-\+]', '_')_installer" |
84 | 84 |
|
85 | 85 | $depsDir = (Get-ChildItem -Path $(Join-Path $VcpkgRootDir installed) | Where-Object {$_.Name -ne "vcpkg"})[0].FullName |
| 86 | +$depsRuntimeDir = Join-Path $depsDir ($IsWindows ? "bin" : "lib") |
86 | 87 |
|
87 | 88 | cmake -S . -B $(Resolve-Path $BuildDir) -G Ninja ` |
88 | 89 | -DCMAKE_BUILD_TYPE=RelWithDebInfo ` |
@@ -91,8 +92,9 @@ cmake -S . -B $(Resolve-Path $BuildDir) -G Ninja ` |
91 | 92 | "-DCMAKE_CXX_COMPILER_LAUNCHER=$($CCache ? 'ccache' : '')" ` |
92 | 93 | -DCMAKE_MSVC_DEBUG_INFORMATION_FORMAT=Embedded ` |
93 | 94 | -DCK_ENABLE_CONSOLE:BOOL=FALSE ` |
| 95 | + -DCK_WIN_APPLOCAL_DEPS:BOOL=ON ` |
94 | 96 | -DQT_NO_PRIVATE_MODULE_WARNING:BOOL=ON ` |
95 | | - "-DQMSETUP_APPLOCAL_DEPS_PATHS_RELWITHDEBINFO=$(Join-Path $depsDir lib)" ` |
| 97 | + "-DQMSETUP_APPLOCAL_DEPS_PATHS_RELWITHDEBINFO=$depsRuntimeDir" ` |
96 | 98 | -DAPPLICATION_INSTALL:BOOL=ON ` |
97 | 99 | -DAPPLICATION_CONFIGURE_INSTALLER:BOOL=ON ` |
98 | 100 | -DINNOSETUP_USE_UNOFFICIAL_LANGUAGE:BOOL=ON ` |
|