Skip to content

Commit de57e61

Browse files
committed
Fixed windows and mac CIs.
1 parent 576d50f commit de57e61

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

.github/workflows/build_mac.yml

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
shell: bash
3232
run: |
3333
./vcpkg/bootstrap-vcpkg.sh -disableMetrics
34+
brew install autoconf autoconf-archive
3435
3536
- name: Build
3637
shell: bash
@@ -45,6 +46,7 @@ jobs:
4546
shell: bash
4647
run: |
4748
cd build
49+
cmake .. -DBUILD_TESTS=1
4850
cmake --build . --config $BUILD_TYPE --target DegateTests
4951
cd tests/out/bin
5052
./DegateTests

.github/workflows/build_windows.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,10 @@ jobs:
4141
shell: bash
4242
run: |
4343
cd build
44+
cmake .. -DBUILD_TESTS=1
4445
cmake --build . --config $BUILD_TYPE --target DegateTests
46+
./vcpkg_installed/x64-windows/tools/qt5/bin/windeployqt.exe ./tests/out/bin/$BUILD_TYPE
4547
cd tests/out/bin/$BUILD_TYPE
46-
$Qt6_DIR/bin/windeployqt.exe ./
4748
./DegateTests.exe
4849
4950
- name: Upload vcpkg build logs

README.md

+5
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ We use [vcpkg](https://vcpkg.io) to handle installation of those, please refer t
137137
For Linux (please the Linux section below):
138138
- xcb-lib
139139
- xrender-lib
140+
- autoconf
140141
- autoconf-archive
141142
- xkbcommon
142143
- egl1-mesa-lib
@@ -155,6 +156,9 @@ First, clone this repository (help [here](https://docs.github.com/en/github/crea
155156
Prepare the install of dependencies:
156157
```console
157158
> ./vcpkg/bootstrap-vcpkg.sh -disableMetrics
159+
> apt install '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev libxkbcommon-dev
160+
libxkbcommon-x11-dev libegl1-mesa-dev
161+
> apt install libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxrandr-dev libxxf86vm-dev autoconf autoconf-archive
158162
```
159163
If anything is missing, you should be prompted with help on how to install the needed tools.
160164

@@ -187,6 +191,7 @@ Binaries are in the 'build/out/bin' folder.
187191
Prepare the install of dependencies:
188192
```console
189193
> ./vcpkg/bootstrap-vcpkg.sh -disableMetrics
194+
> brew install autoconf autoconf-archive
190195
```
191196

192197
Build (in the 'build' folder, for example):

0 commit comments

Comments
 (0)