Fixes to build with vcpkg

cwi-dis · Feb 23, 2024 · a8ccc35 · a8ccc35
1 parent d215d9c
commit a8ccc35
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -36,6 +36,10 @@ jobs:
           shell: pwsh
           run: scripts\install-3rdparty-full-win1064.ps1
 
+        - name: Bootstrap vcpkg
+          shell: pwsh
+          run: vcpkg\bootstrap-vcpkg.bat
+
         - name: Install Python packages (Windows)
           shell: bash
           run: |
@@ -49,7 +53,7 @@ jobs:
           uses: ashutoshvarma/action-cmake-build@master
           with:
                 build-dir: ${{ github.workspace }}/build
-                configure-options: -Wno-dev -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/installed -DPython3_EXECUTABLE=${{ env.Python3_EXECUTABLE }} -DOpenCV_ROOT=${{ env.OPENCV_DIR }}
+                configure-options: -Wno-dev -DCMAKE_TOOLCHAIN_FILE=scripts/buildsystems/vcpkg.cmake -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/installed -DPython3_EXECUTABLE=${{ env.Python3_EXECUTABLE }} -DOpenCV_ROOT=${{ env.OPENCV_DIR }}
                 build-type: Release
                 run-test: true
                 install-build: true

diff --git a/scripts/install-3rdparty-full-win1064.ps1 b/scripts/install-3rdparty-full-win1064.ps1
@@ -104,7 +104,7 @@ if(Can-Execute-From-Path("jpegtran -help")) {
 $ok = Can-Execute-From-Path("pcl_generate -help")
 $skip_pcl = 1
 if($skip_pcl) {
-	Write-Output: "pcl: skipped"
+	Write-Output "pcl: skipped"
 } elsif($ok) {
 	Write-Output "pcl: already installed"
 } else {