Skip to content

Commit 5069712

Browse files
committed
Fixed build issues
1 parent 81f074e commit 5069712

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

eng/pipelines/templates/steps/cmake-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@ steps:
1616
displayName: cmake --version
1717

1818
- script: |
19-
${{ parameters.Env }} cmake ${{ parameters.GenerateArgs }} ..
19+
${{ parameters.Env }} cmake ${{ parameters.VcpkgArgs }} ${{ parameters.GenerateArgs }} ..
2020
workingDirectory: build
2121
displayName: cmake generate
2222
env:
2323
VCPKG_BINARY_SOURCES: $(VCPKG_BINARY_SOURCES_SECRET)
2424
2525
# Core should build all cmake tagets
2626
- ${{ if and(eq(parameters.Build, true), eq(parameters.ServiceDirectory, 'core')) }}:
27-
- script: cmake --build . ${{ parameters.VcpkgArgs }} ${{ parameters.BuildArgs }}
27+
- script: cmake --build . ${{ parameters.BuildArgs }}
2828
workingDirectory: build
2929
displayName: cmake build All
3030

3131
# Non-core services define the list of targets to build
3232
- ${{ if and(eq(parameters.Build, true) , ne(parameters.ServiceDirectory, 'core')) }}:
33-
- pwsh: cmake --build . ${{ parameters.VcpkgArgs }} ${{ parameters.BuildArgs }} --target (Get-Content ${{ parameters.ServiceDirectory }}-targets-build.txt)
33+
- pwsh: cmake --build . ${{ parameters.BuildArgs }} --target (Get-Content ${{ parameters.ServiceDirectory }}-targets-build.txt)
3434
workingDirectory: build
3535
displayName: cmake build Targets
3636

eng/scripts/Get-BinarySizes.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ param(
1919
[string] $BuildArgs,
2020

2121
[Parameter()]
22-
[string] $VcpkgArgs
22+
[string] $VcpkgArgs,
2323

2424
[Parameter()]
2525
[string] $Job,

0 commit comments

Comments
 (0)