Skip to content

Commit 50dba8e

Browse files
authored
Merge branch 'gz-sim8' into gz-sim8
2 parents 5b76e40 + 500fe86 commit 50dba8e

File tree

158 files changed

+5800
-991
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+5800
-991
lines changed

.github/ci/after_make.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,3 @@ set -e
66
# Install (needed for some tests)
77
make install
88
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib
9-
10-
# For gz-tools
11-
export GZ_CONFIG_PATH=/usr/local/share/gz
12-
13-
# For rendering / window tests
14-
Xvfb :1 -screen 0 1280x1024x24 &
15-
export DISPLAY=:1.0
16-
export RENDER_ENGINE_VALUES=ogre2
17-
export MESA_GL_VERSION_OVERRIDE=3.3

.github/ci/before_cmake.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh -l
2+
3+
set -x
4+
5+
# For rendering / window tests
6+
Xvfb :1 -screen 0 1280x1024x24 &
7+
export DISPLAY=:1.0
8+
export RENDER_ENGINE_VALUES=ogre2
9+
export MESA_GL_VERSION_OVERRIDE=3.3

.github/ci/packages.apt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,5 @@ qtdeclarative5-dev
4444
qtquickcontrols2-5-dev
4545
uuid-dev
4646
xvfb
47+
x11-utils
48+
mesa-utils

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
uses: gazebo-tooling/action-gz-ci@jammy
2929
with:
3030
# per bug https://github.com/gazebosim/gz-sim/issues/1409
31-
cmake-args: '-DBUILD_DOCS=OFF'
31+
cmake-args: '-DCMAKE_INSTALL_PREFIX=/usr -DBUILD_DOCS=OFF'
3232
codecov-enabled: true
3333
cppcheck-enabled: true
3434
cpplint-enabled: true

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
33
#============================================================================
44
# Initialize the project
55
#============================================================================
6-
project(gz-sim8 VERSION 8.3.0)
6+
project(gz-sim8 VERSION 8.7.0)
77
set (GZ_DISTRIBUTION "Harmonic")
88

99
#============================================================================
@@ -66,7 +66,7 @@ cmake_dependent_option(USE_DIST_PACKAGES_FOR_PYTHON
6666
#============================================================================
6767

6868
# Setting this policy enables using the protobuf_MODULE_COMPATIBLE
69-
# set command in CMake versions older than 13.13
69+
# set command when cmake_minimum_required is less than 3.13
7070
set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
7171
# This option is needed to use the PROTOBUF_GENERATE_CPP
7272
# in case protobuf is found with the CMake config files
@@ -136,7 +136,7 @@ set(GZ_PHYSICS_VER ${gz-physics7_VERSION_MAJOR})
136136

137137
#--------------------------------------
138138
# Find gz-sensors
139-
gz_find_package(gz-sensors8 REQUIRED
139+
gz_find_package(gz-sensors8 REQUIRED VERSION 8.2.0
140140
# component order is important
141141
COMPONENTS
142142
# non-rendering

0 commit comments

Comments
 (0)