Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump main to 7.0.0~pre1 #458

Merged
merged 2 commits into from
Oct 15, 2021
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
#============================================================================
# Initialize the project
#============================================================================
project(ignition-rendering6 VERSION 6.0.0)
project(ignition-rendering7 VERSION 7.0.0)
chapulina marked this conversation as resolved.
Show resolved Hide resolved

#============================================================================
# Find ignition-cmake
4 changes: 4 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## Ignition Rendering

### Ignition Rendering 7.X

### Ignition Rendering 7.0.0 (202X-XX-XX)

### Ignition Rendering 6.X

### Ignition Rendering 6.0.0 (20XX-XX-XX)
2 changes: 1 addition & 1 deletion examples/actor_animation/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-actor-animation)
find_package(ignition-rendering6 REQUIRED)
find_package(ignition-rendering7 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
2 changes: 1 addition & 1 deletion examples/camera_tracking/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-camera-tracking)
find_package(ignition-rendering6 REQUIRED)
find_package(ignition-rendering7 REQUIRED)

find_package(GLUT REQUIRED)
include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
2 changes: 1 addition & 1 deletion examples/custom_scene_viewer/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-custom-scene-viewer)
find_package(ignition-rendering6 REQUIRED)
find_package(ignition-rendering7 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
2 changes: 1 addition & 1 deletion examples/custom_shaders/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ include_directories(SYSTEM
${PROJECT_BINARY_DIR}
)

find_package(ignition-rendering6 REQUIRED)
find_package(ignition-rendering7 REQUIRED)

find_package(GLUT REQUIRED)
include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
2 changes: 1 addition & 1 deletion examples/custom_shaders_uniforms/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ include_directories(SYSTEM
${PROJECT_BINARY_DIR}
)

find_package(ignition-rendering6)
find_package(ignition-rendering7)

set(TARGET_THIRD_PARTY_DEPENDS "")

2 changes: 1 addition & 1 deletion examples/gazebo_scene_viewer/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-gazebo-scene-viewer)
find_package(ignition-rendering6 REQUIRED)
find_package(ignition-rendering7 REQUIRED)
find_package(gazebo REQUIRED)

include_directories(SYSTEM ${GAZEBO_INCLUDE_DIRS})
2 changes: 1 addition & 1 deletion examples/heightmap/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-heightmap)
find_package(ignition-rendering6 REQUIRED)
find_package(ignition-rendering7 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
2 changes: 1 addition & 1 deletion examples/hello_world_plugin/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
set(IGN_PLUGIN_VER 1)
set(IGN_COMMON_VER 3)

find_package(ignition-rendering6 REQUIRED)
find_package(ignition-rendering7 REQUIRED)
find_package(ignition-plugin1 REQUIRED COMPONENTS all)

add_library(HelloWorldPlugin SHARED HelloWorldPlugin.cc)
2 changes: 1 addition & 1 deletion examples/lidar_visual/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-lidar_visual)
find_package(ignition-rendering6 REQUIRED)
find_package(ignition-rendering7 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
2 changes: 1 addition & 1 deletion examples/mesh_viewer/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-mesh-viewer)
find_package(ignition-rendering6 REQUIRED)
find_package(ignition-rendering7 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
2 changes: 1 addition & 1 deletion examples/mouse_picking/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-mouse-picking)
find_package(ignition-rendering6 REQUIRED)
find_package(ignition-rendering7 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
2 changes: 1 addition & 1 deletion examples/ogre2_demo/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
project(ignition-rendering-ogre2-demo)

find_package(ignition-rendering6)
find_package(ignition-rendering7)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
2 changes: 1 addition & 1 deletion examples/particles_demo/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-particles-demo)
find_package(ignition-rendering6 REQUIRED)
find_package(ignition-rendering7 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
2 changes: 1 addition & 1 deletion examples/render_pass/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-render-pass)

find_package(ignition-rendering6)
find_package(ignition-rendering7)

find_package(GLUT REQUIRED)
include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
2 changes: 1 addition & 1 deletion examples/segmentation_camera/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-segmentation-camera)
find_package(ignition-rendering6 REQUIRED)
find_package(ignition-rendering7 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
2 changes: 1 addition & 1 deletion examples/simple_demo/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-simple-demo)

find_package(ignition-rendering6)
find_package(ignition-rendering7)

find_package(GLUT REQUIRED)
include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
2 changes: 1 addition & 1 deletion examples/simple_demo_qml/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ set(IGN_CMAKE_VER ${ignition-cmake2_VERSION_MAJOR})

#------------------------------------------------------------------------
# Find ign-rendering
find_package(ignition-rendering6)
find_package(ignition-rendering7)

#======================================
# Find Qt
2 changes: 1 addition & 1 deletion examples/text_geom/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-text-geom)

find_package(ignition-rendering6)
find_package(ignition-rendering7)

find_package(GLUT REQUIRED)
include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
2 changes: 1 addition & 1 deletion examples/thermal_camera/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-thermal-camera)
find_package(ignition-rendering6 REQUIRED)
find_package(ignition-rendering7 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
2 changes: 1 addition & 1 deletion examples/transform_control/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-transform-control)
find_package(ignition-rendering6 REQUIRED)
find_package(ignition-rendering7 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
2 changes: 1 addition & 1 deletion examples/view_control/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-view-control)
find_package(ignition-rendering6 REQUIRED)
find_package(ignition-rendering7 REQUIRED)

find_package(GLUT REQUIRED)
include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
2 changes: 1 addition & 1 deletion examples/visualization_demo/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-visualization-demo)

find_package(ignition-rendering6)
find_package(ignition-rendering7)

if (APPLE OR UNIX)
find_package(GLUT REQUIRED)
2 changes: 1 addition & 1 deletion tutorials/17_render_pass_tutorial.md
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ Execute the example:
You'll see:

```{.sh}
[Msg] Loading plugin [ignition-rendering6-ogre]
[Msg] Loading plugin [ignition-rendering7-ogre]
Engine 'optix' is not supported
===============================
TAB - Switch render engines
2 changes: 1 addition & 1 deletion tutorials/18_simple_demo_tutorial.md
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ Execute the example:
You'll see:

```{.sh}
[Msg] Loading plugin [ignition-rendering6-ogre]
[Msg] Loading plugin [ignition-rendering7-ogre]
Engine 'optix' is not supported
===============================
TAB - Switch render engines
2 changes: 1 addition & 1 deletion tutorials/19_text_geom_tutorial.md
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ Execute the example:
You'll see:

```{.sh}
[Msg] Loading plugin [ignition-rendering6-ogre]
[Msg] Loading plugin [ignition-rendering7-ogre]
Engine 'optix' is not supported
===============================
TAB - Switch render engines
2 changes: 1 addition & 1 deletion tutorials/20_particles_tutorial.md
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ Execute the example:
You'll see:

```{.sh}
[Msg] Loading plugin [ignition-rendering6-ogre2]
[Msg] Loading plugin [ignition-rendering7-ogre2]
===============================
TAB - Switch render engines
ESC - Exit
2 changes: 1 addition & 1 deletion tutorials/21_heightmap.md
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ Execute the example:
You'll see:

```{.sh}
[Msg] Loading plugin [ignition-rendering6-ogre]
[Msg] Loading plugin [ignition-rendering7-ogre]
[Msg] Loading heightmap: scene::Heightmap(65528)
[Msg] Heightmap loaded. Process took 217 ms.
===============================