Skip to content

Commit 6092678

Browse files
Update cmake-multi-platform.yml
1 parent 5dd3568 commit 6092678

1 file changed

Lines changed: 7 additions & 6 deletions

File tree

.github/workflows/cmake-multi-platform.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ jobs:
6666
# ------------------------
6767
# Install dependencies
6868
# ------------------------
69-
7069
- name: Install OpenMP + HDF5 (Ubuntu)
7170
if: startsWith(matrix.os, 'ubuntu')
7271
run: |
@@ -87,10 +86,13 @@ jobs:
8786
C:/tools/msys64/usr/bin/pacman -Syu --noconfirm
8887
C:/tools/msys64/usr/bin/pacman -S --noconfirm mingw-w64-x86_64-hdf5
8988
90-
- name: Install HDF5 (Windows MSVC)
89+
- name: Install vcpkg + HDF5 (Windows MSVC)
9190
if: matrix.os == 'windows-latest' && matrix.c_compiler == 'cl'
91+
shell: powershell
9292
run: |
93-
vcpkg install hdf5[hl]
93+
git clone https://github.com/microsoft/vcpkg.git C:/vcpkg
94+
C:/vcpkg/bootstrap-vcpkg.bat
95+
C:/vcpkg/vcpkg install hdf5[hl]:x64-windows
9496
9597
# ------------------------
9698
# Set build directory
@@ -104,7 +106,6 @@ jobs:
104106
# ------------------------
105107
# Configure CMake
106108
# ------------------------
107-
108109
- name: Configure CMake (macOS)
109110
if: matrix.os == 'macos-latest'
110111
run: >
@@ -129,11 +130,11 @@ jobs:
129130
- name: Configure CMake (Windows MSVC)
130131
if: matrix.os == 'windows-latest' && matrix.c_compiler == 'cl'
131132
run: >
132-
cmake -G "Visual Studio 17 2022"
133+
cmake -G "Visual Studio 17 2022" -A x64
133134
-B ${{ steps.strings.outputs.build-output-dir }}
134135
-S ${{ github.workspace }}
135136
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
136-
-DCMAKE_TOOLCHAIN_FILE=D:/vcpkg/scripts/buildsystems/vcpkg.cmake
137+
-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
137138
138139
- name: Configure CMake (Linux)
139140
if: startsWith(matrix.os, 'ubuntu')

0 commit comments

Comments
 (0)