Skip to content

Commit d372b59

Browse files
author
Michel Schmid
committed
fix github pipeline for macos and windows
Also changed vcpkg dependency from qt5 to qt5-base, because that should be enough and vcpkg seems to build from source (?) and no one has time to build Qt completely. Includes some hacks to get around the fact that the macos pipeline does not set the path to the QtConfig.cmake correctly.
1 parent 2f304e0 commit d372b59

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

.github/workflows/build.yaml

+6-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,11 @@ jobs:
3131
steps:
3232
- uses: actions/checkout@v4
3333
- name: "Install dependencies"
34-
run: brew tap robotology/formulae && brew install cmake pkg-config qt@5 protobuf@21 robotology/formulae/ode
34+
run: brew tap robotology/formulae && brew install cmake pkg-config qt@5
3535
- name: "Build"
36-
run: make
36+
# for some reason qt5 is not correctly in the path and this will break whenever the location of it changes
37+
# 5.15.11 is for macos-12 and 5.15.12 is for macos-13
38+
run: PATH=/usr/local/Cellar/qt@5/5.15.11/lib/cmake/Qt5:/usr/local/Cellar/qt@5/5.15.12/lib/cmake/Qt5:$PATH && make BUILD_ODE=ON
3739

3840
build-windows:
3941
runs-on: windows-latest
@@ -45,7 +47,8 @@ jobs:
4547
with:
4648
vcpkgGitCommitId: 8eb57355a4ffb410a2e94c07b4dca2dffbee8e50
4749
vcpkgDirectory: c:/vcpkg # folder must reside in c:\ otherwise qt wont install due to long path errors
48-
50+
# needed to actually install the vcpkg dependencies
51+
runVcpkgInstall: true
4952

5053
- name: Run CMake and run vcpkg to build packages
5154
uses: lukka/run-cmake@v10

Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ BUILDDIR=build
44
BUILDTYPE=Release
55
#BUILDTYPE=Debug
66

7+
BUILD_ODE=OFF
8+
79
.PHONY: all build mkbuilddir cmake dist package deb install clean clean-all
810

911
all: build
@@ -22,7 +24,7 @@ mkbuilddir:
2224
[ -d $(BUILDDIR) ] || mkdir $(BUILDDIR)
2325

2426
cmake: CMakeLists.txt
25-
cd $(BUILDDIR) && cmake -DCMAKE_BUILD_TYPE=$(BUILDTYPE) ..
27+
cd $(BUILDDIR) && cmake -DCMAKE_BUILD_TYPE=$(BUILDTYPE) -DBUILD_ODE=$(BUILD_ODE) ..
2628

2729
dist: package
2830

vcpkg.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"name": "grsim",
33
"version-string": "0.0.1",
44
"dependencies": [
5-
"qt5",
5+
"qt5-base",
66
"ode",
77
"protobuf"
88
]
9-
}
9+
}

0 commit comments

Comments
 (0)