You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ri...@apache.org on 2024/09/19 14:02:56 UTC

svn commit: r1920783 - /subversion/trunk/.github/workflows/cmake.yml

Author: rinrab
Date: Thu Sep 19 14:02:56 2024
New Revision: 1920783

URL: http://svn.apache.org/viewvc?rev=1920783&view=rev
Log:
GitHub Actions: Using vcpkg toolchain instead of CMAKE_PREFIX_PATH for
dependencies.

vcpkg toolchain will automatically copy DLLs of the dependencies, needed for
testing.

* .github/workflows/cmake.yml
  (win deps): Export CMAKE_TOOLCHAIN_FILE environment variable from the step
   instead of CMAKE_PREFIX_PATH.

Modified:
    subversion/trunk/.github/workflows/cmake.yml

Modified: subversion/trunk/.github/workflows/cmake.yml
URL: http://svn.apache.org/viewvc/subversion/trunk/.github/workflows/cmake.yml?rev=1920783&r1=1920782&r2=1920783&view=diff
==============================================================================
--- subversion/trunk/.github/workflows/cmake.yml (original)
+++ subversion/trunk/.github/workflows/cmake.yml Thu Sep 19 14:02:56 2024
@@ -75,7 +75,7 @@ jobs:
           C:\vcpkg\vcpkg.exe install --triplet ${{ matrix.vcpkg_triplet }} `
             apr apr-util expat zlib sqlite3
 
-          "CMAKE_PREFIX_PATH=C:\vcpkg\installed\${{ matrix.vcpkg_triplet }}" >> $env:GITHUB_ENV
+          "CMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake" >> $env:GITHUB_ENV
 
       - name: Install dependecies (Linux, apt-get)
         if: runner.os == 'Linux'