Skip to content

Commit

Permalink
Bumps in ionic : ci_matching_branch/bump_ionic_gz-rendering9
Browse files Browse the repository at this point in the history
Signed-off-by: Addisu Z. Taddese <[email protected]>
  • Loading branch information
azeey committed Oct 16, 2023
1 parent eaee086 commit cbe219e
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/ci/packages.apt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
freeglut3-dev
libfreeimage-dev
libglew-dev
libgz-cmake3-dev
libgz-common5-dev
libgz-cmake4-dev
libgz-common6-dev
libgz-math7-dev
libgz-math7-eigen3-dev
libgz-plugin2-dev
Expand Down
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ project(gz-rendering9 VERSION 9.0.0)
# Find gz-cmake
#============================================================================
# If you get an error at this line, you need to install gz-cmake
find_package(gz-cmake3 REQUIRED)
set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR})
find_package(gz-cmake4 REQUIRED)
set(GZ_CMAKE_VER ${gz-cmake4_VERSION_MAJOR})

#============================================================================
# Set up the project
Expand All @@ -36,9 +36,9 @@ set(GZ_MATH_VER ${gz-math7_VERSION_MAJOR})

#--------------------------------------
# Find gz-common
gz_find_package(gz-common5 REQUIRED
gz_find_package(gz-common6 REQUIRED
COMPONENTS graphics events geospatial)
set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR})
set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR})

#--------------------------------------
# Find gz-plugin
Expand Down
4 changes: 2 additions & 2 deletions examples/hello_world_plugin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ set(GZ_RENDERING_VER ${gz-rendering9_VERSION_MAJOR})
find_package(gz-plugin2 REQUIRED COMPONENTS all)
set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})

find_package(gz-common5 REQUIRED)
set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR})
find_package(gz-common6 REQUIRED)
set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR})

add_library(HelloWorldPlugin SHARED HelloWorldPlugin.cc)
target_link_libraries(HelloWorldPlugin
Expand Down
4 changes: 2 additions & 2 deletions examples/simple_demo_qml/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ project(gz-rendering-simple-demo-qml)

#------------------------------------------------------------------------
# Find gz-cmake
find_package(gz-cmake3 REQUIRED)
set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR})
find_package(gz-cmake4 REQUIRED)
set(GZ_CMAKE_VER ${gz-cmake4_VERSION_MAJOR})

#------------------------------------------------------------------------
# Find gz-rendering
Expand Down
4 changes: 2 additions & 2 deletions tutorials/02_install.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ sudo apt install -y \
freeglut3-dev \
libxmu-dev \
libxi-dev \
libgz-cmake3-dev \
libgz-cmake4-dev \
libgz-math7-dev \
libgz-common5-dev \
libgz-common6-dev \
libgz-plugin2-dev
```

Expand Down

0 comments on commit cbe219e

Please sign in to comment.