Fixed build issues

Azure · Oct 24, 2022 · 5069712 · 5069712
1 parent 81f074e
commit 5069712
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/eng/pipelines/templates/steps/cmake-build.yml b/eng/pipelines/templates/steps/cmake-build.yml
@@ -16,21 +16,21 @@ steps:
     displayName: cmake --version
 
   - script: |
-      ${{ parameters.Env }} cmake ${{ parameters.GenerateArgs }} ..
+      ${{ parameters.Env }} cmake ${{ parameters.VcpkgArgs }} ${{ parameters.GenerateArgs }} ..
     workingDirectory: build
     displayName: cmake generate
     env:
       VCPKG_BINARY_SOURCES: $(VCPKG_BINARY_SOURCES_SECRET)
 
 # Core should build all cmake tagets
   - ${{ if and(eq(parameters.Build, true), eq(parameters.ServiceDirectory, 'core')) }}:
-    - script: cmake --build . ${{ parameters.VcpkgArgs }} ${{ parameters.BuildArgs }}
+    - script: cmake --build . ${{ parameters.BuildArgs }}
       workingDirectory: build
       displayName: cmake build All
 
 # Non-core services define the list of targets to build
   - ${{ if and(eq(parameters.Build, true) , ne(parameters.ServiceDirectory, 'core')) }}:
-    - pwsh: cmake --build . ${{ parameters.VcpkgArgs }} ${{ parameters.BuildArgs }} --target (Get-Content ${{ parameters.ServiceDirectory }}-targets-build.txt)
+    - pwsh: cmake --build . ${{ parameters.BuildArgs }} --target (Get-Content ${{ parameters.ServiceDirectory }}-targets-build.txt)
       workingDirectory: build
       displayName: cmake build Targets
 
diff --git a/eng/scripts/Get-BinarySizes.ps1 b/eng/scripts/Get-BinarySizes.ps1
@@ -19,7 +19,7 @@ param(
     [string] $BuildArgs,
 
     [Parameter()]
-	[string] $VcpkgArgs
+	[string] $VcpkgArgs,
 
     [Parameter()]
     [string] $Job,