Skip to content

Commit c855712

Browse files
committed
CI: modify vcpkg.yml
1 parent 1da0ec7 commit c855712

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

.github/workflows/vcpkg.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818

1919
env:
2020
VCPKGGITCOMMITID: 6bc1613f18f850c60d906575296f982c6dfcc9e0
21+
CMAKE_GENERATOR_PLATFORM: ${{matrix.CMAKE_GENERATOR_PLATFORM}}
2122
VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
2223
VCPKG_DEFAULT_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
2324
VCPKG_PLATFORM_TOOLSET: ${{matrix.VCPKG_PLATFORM_TOOLSET}}
@@ -87,8 +88,8 @@ jobs:
8788
git config --global core.protectNTFS false
8889
8990
cmake ${{github.workspace}} `
90-
-A ${{matrix.CMAKE_GENERATOR_PLATFORM}} `
91-
-T ${{matrix.VCPKG_PLATFORM_TOOLSET}} `
91+
-A ${{env.CMAKE_GENERATOR_PLATFORM}} `
92+
-T ${{env.VCPKG_PLATFORM_TOOLSET}} `
9293
-DCMARK_SHARED=OFF `
9394
-DCMARK_TESTS=OFF `
9495
-DCMARK_STATIC=ON `
@@ -102,9 +103,9 @@ jobs:
102103
-DCMAKE_INSTALL_PREFIX=${{env.BUILD_DIR}}/install `
103104
-DCMAKE_PREFIX_PATH=${{env.INSTALL_DIR}} `
104105
-DCMAKE_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake `
105-
-DVCPKG_MANIFEST_FEATURES=${{env.VCPKG_MANIFEST_FEATURES}} `
106+
-DVCPKG_MANIFEST_FEATURES="${{env.VCPKG_MANIFEST_FEATURES}}" `
106107
-DVCPKG_VERBOSE=ON `
107-
-DVCPKG_TARGET_TRIPLET=${{matrix.VCPKG_TARGET_TRIPLET}} `
108+
-DVCPKG_TARGET_TRIPLET="${{env.VCPKG_TARGET_TRIPLET}}" `
108109
-DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON `
109110
-DVCPKG_APPLOCAL_DEPS=ON `
110111
-DVCPKG_TRACE_FIND_PACKAGE=ON `

0 commit comments

Comments
 (0)