Skip to content

Commit 3ba2f1e

Browse files
authored
Add Github Action for Windows and fix build (#1049)
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
1 parent 6136735 commit 3ba2f1e

File tree

2 files changed

+54
-2
lines changed

2 files changed

+54
-2
lines changed

.github/workflows/windows.yaml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: Windows
2+
on:
3+
pull_request:
4+
5+
jobs:
6+
build:
7+
name: Window CI
8+
env:
9+
PACKAGE: gz-rendering9
10+
runs-on: windows-latest
11+
steps:
12+
- name: setup-pixi
13+
uses: prefix-dev/setup-pixi@v0.8.1
14+
with:
15+
run-install: false
16+
17+
- name: Install build tools
18+
run: |
19+
pixi init
20+
pixi add vcstool colcon-common-extensions pkgconfig
21+
- name: Setup pixi env variables
22+
shell: bash
23+
run: |
24+
eval "$(pixi shell-hook)"
25+
echo CMAKE_PREFIX_PATH=$CONDA_PREFIX/Library >> $GITHUB_ENV
26+
- name: Install base dependencies
27+
run: |
28+
# List adapted from https://github.com/gazebo-tooling/release-tools/blob/f89ac8cafc646260598eb8eb6d94be8093bdc9f7/jenkins-scripts/lib/windows_env_vars.bat#L22
29+
pixi add assimp dlfcn-win32 eigen ffmpeg freeimage gdal gflags ogre ogre-next spdlog tinyxml2
30+
- name: Clone source dependencies
31+
run: |
32+
mkdir src
33+
cd src
34+
pixi run vcs import --input https://raw.githubusercontent.com/gazebo-tooling/gazebodistro/master/${env:PACKAGE}.yaml
35+
36+
- uses: actions/checkout@v4
37+
with:
38+
path: src/gz-rendering
39+
40+
- name: Build Dependencies
41+
run: |
42+
pixi run colcon build --merge-install --cmake-args -G"Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF --event-handlers console_direct+ --packages-up-to ${env:PACKAGE}
43+
44+
- name: Build Package
45+
run: pixi run colcon build --merge-install --cmake-args -G"Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON -DSKIP_ogre=ON --event-handlers console_direct+ --packages-select ${env:PACKAGE}
46+
47+
- name: Test
48+
run: pixi run colcon test --merge-install --event-handlers console_direct+ --packages-select ${env:PACKAGE}

ogre2/src/Ogre2Scene.cc

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,14 @@
2020
#include <OpenGL/gl.h>
2121
#include <OpenGL/glext.h>
2222
#else
23-
#ifndef _WIN32
23+
#ifdef _WIN32
24+
// windows.h has to be included *before* GL/gl.h
25+
// to avoid redefinition errors.
26+
#include <windows.h>
27+
#endif
28+
2429
#include <GL/gl.h>
2530
#endif
26-
#endif
2731

2832
#include <gz/common/Console.hh>
2933

0 commit comments

Comments
 (0)