From d18dd1c6540b2aaa581a3f48ce96022d7ba19bda Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Fri, 9 Oct 2020 09:56:53 -0700 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20=20Bump=20main=20to=205.0.?= =?UTF-8?q?0~pre1=20(#160)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Louise Poubel --- CMakeLists.txt | 4 ++-- examples/actor_animation/CMakeLists.txt | 2 +- examples/camera_tracking/CMakeLists.txt | 2 +- examples/custom_scene_viewer/CMakeLists.txt | 2 +- examples/custom_shaders/CMakeLists.txt | 2 +- examples/gazebo_scene_viewer/CMakeLists.txt | 2 +- examples/lidar_visual/CMakeLists.txt | 2 +- examples/mesh_viewer/CMakeLists.txt | 2 +- examples/mouse_picking/CMakeLists.txt | 2 +- examples/ogre2_demo/CMakeLists.txt | 2 +- examples/particles_demo/CMakeLists.txt | 2 +- examples/render_pass/CMakeLists.txt | 2 +- examples/simple_demo/CMakeLists.txt | 2 +- examples/text_geom/CMakeLists.txt | 2 +- examples/thermal_camera/CMakeLists.txt | 2 +- examples/transform_control/CMakeLists.txt | 2 +- examples/view_control/CMakeLists.txt | 2 +- tutorials/17_render_pass_tutorial.md | 2 +- tutorials/18_simple_demo_tutorial.md | 2 +- tutorials/19_text_geom_tutorial.md | 2 +- tutorials/20_particles_tutorial.md | 2 +- 21 files changed, 22 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f37549f7..abb75b6f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) #============================================================================ # Initialize the project #============================================================================ -project(ignition-rendering4 VERSION 4.0.0) +project(ignition-rendering5 VERSION 5.0.0) #============================================================================ # Find ignition-cmake @@ -14,7 +14,7 @@ find_package(ignition-cmake2 REQUIRED) #============================================================================ # Set up the project #============================================================================ -ign_configure_project(VERSION_SUFFIX) +ign_configure_project(VERSION_SUFFIX pre1) #============================================================================ # Set project-specific options diff --git a/examples/actor_animation/CMakeLists.txt b/examples/actor_animation/CMakeLists.txt index ee1ae05c6..e86eae086 100644 --- a/examples/actor_animation/CMakeLists.txt +++ b/examples/actor_animation/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(ignition-rendering-actor-animation) -find_package(ignition-rendering4 REQUIRED) +find_package(ignition-rendering5 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/camera_tracking/CMakeLists.txt b/examples/camera_tracking/CMakeLists.txt index ee52f35eb..945cfbe33 100644 --- a/examples/camera_tracking/CMakeLists.txt +++ b/examples/camera_tracking/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(ignition-rendering-camera-tracking) -find_package(ignition-rendering4 REQUIRED) +find_package(ignition-rendering5 REQUIRED) find_package(GLUT REQUIRED) include_directories(SYSTEM ${GLUT_INCLUDE_DIRS}) diff --git a/examples/custom_scene_viewer/CMakeLists.txt b/examples/custom_scene_viewer/CMakeLists.txt index b517b12b4..b56ac7bec 100644 --- a/examples/custom_scene_viewer/CMakeLists.txt +++ b/examples/custom_scene_viewer/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(ignition-rendering-custom-scene-viewer) -find_package(ignition-rendering4 REQUIRED) +find_package(ignition-rendering5 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/custom_shaders/CMakeLists.txt b/examples/custom_shaders/CMakeLists.txt index af34e3280..3615df111 100644 --- a/examples/custom_shaders/CMakeLists.txt +++ b/examples/custom_shaders/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories(SYSTEM ${PROJECT_BINARY_DIR} ) -find_package(ignition-rendering4 REQUIRED) +find_package(ignition-rendering5 REQUIRED) find_package(GLUT REQUIRED) include_directories(SYSTEM ${GLUT_INCLUDE_DIRS}) diff --git a/examples/gazebo_scene_viewer/CMakeLists.txt b/examples/gazebo_scene_viewer/CMakeLists.txt index 9ff4b937a..b73873e2a 100644 --- a/examples/gazebo_scene_viewer/CMakeLists.txt +++ b/examples/gazebo_scene_viewer/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(ignition-rendering-gazebo-scene-viewer) -find_package(ignition-rendering4 REQUIRED) +find_package(ignition-rendering5 REQUIRED) find_package(gazebo REQUIRED) include_directories(SYSTEM ${GAZEBO_INCLUDE_DIRS}) diff --git a/examples/lidar_visual/CMakeLists.txt b/examples/lidar_visual/CMakeLists.txt index 02c9999e9..3e1816993 100644 --- a/examples/lidar_visual/CMakeLists.txt +++ b/examples/lidar_visual/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(ignition-rendering-lidar_visual) -find_package(ignition-rendering4 REQUIRED) +find_package(ignition-rendering5 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/mesh_viewer/CMakeLists.txt b/examples/mesh_viewer/CMakeLists.txt index 4036acffd..ff40e4415 100644 --- a/examples/mesh_viewer/CMakeLists.txt +++ b/examples/mesh_viewer/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(ignition-rendering-mesh-viewer) -find_package(ignition-rendering4 REQUIRED) +find_package(ignition-rendering5 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/mouse_picking/CMakeLists.txt b/examples/mouse_picking/CMakeLists.txt index 9ac08e43a..72d454caa 100644 --- a/examples/mouse_picking/CMakeLists.txt +++ b/examples/mouse_picking/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(ignition-rendering-mouse-picking) -find_package(ignition-rendering4 REQUIRED) +find_package(ignition-rendering5 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/ogre2_demo/CMakeLists.txt b/examples/ogre2_demo/CMakeLists.txt index f32780d84..d88ddd2d7 100644 --- a/examples/ogre2_demo/CMakeLists.txt +++ b/examples/ogre2_demo/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) project(ignition-rendering-ogre2-demo) -find_package(ignition-rendering4) +find_package(ignition-rendering5) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/particles_demo/CMakeLists.txt b/examples/particles_demo/CMakeLists.txt index eadd03162..45a53dda7 100644 --- a/examples/particles_demo/CMakeLists.txt +++ b/examples/particles_demo/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(ignition-rendering-particles-demo) -find_package(ignition-rendering4 REQUIRED) +find_package(ignition-rendering5 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/render_pass/CMakeLists.txt b/examples/render_pass/CMakeLists.txt index 4d6915707..ce3f04f2a 100644 --- a/examples/render_pass/CMakeLists.txt +++ b/examples/render_pass/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(ignition-rendering-render-pass) -find_package(ignition-rendering4) +find_package(ignition-rendering5) find_package(GLUT REQUIRED) include_directories(SYSTEM ${GLUT_INCLUDE_DIRS}) diff --git a/examples/simple_demo/CMakeLists.txt b/examples/simple_demo/CMakeLists.txt index 0795e75b6..e0f6b604d 100644 --- a/examples/simple_demo/CMakeLists.txt +++ b/examples/simple_demo/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(ignition-rendering-simple-demo) -find_package(ignition-rendering4) +find_package(ignition-rendering5) find_package(GLUT REQUIRED) include_directories(SYSTEM ${GLUT_INCLUDE_DIRS}) diff --git a/examples/text_geom/CMakeLists.txt b/examples/text_geom/CMakeLists.txt index e10f4994c..dddf3c308 100644 --- a/examples/text_geom/CMakeLists.txt +++ b/examples/text_geom/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(ignition-rendering-text-geom) -find_package(ignition-rendering4) +find_package(ignition-rendering5) find_package(GLUT REQUIRED) include_directories(SYSTEM ${GLUT_INCLUDE_DIRS}) diff --git a/examples/thermal_camera/CMakeLists.txt b/examples/thermal_camera/CMakeLists.txt index d3c20748c..f58c99228 100644 --- a/examples/thermal_camera/CMakeLists.txt +++ b/examples/thermal_camera/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(ignition-rendering-thermal-camera) -find_package(ignition-rendering4 REQUIRED) +find_package(ignition-rendering5 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/transform_control/CMakeLists.txt b/examples/transform_control/CMakeLists.txt index a5cb8fc93..03f46571f 100644 --- a/examples/transform_control/CMakeLists.txt +++ b/examples/transform_control/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(ignition-rendering-transform-control) -find_package(ignition-rendering4 REQUIRED) +find_package(ignition-rendering5 REQUIRED) include_directories(SYSTEM ${PROJECT_BINARY_DIR} diff --git a/examples/view_control/CMakeLists.txt b/examples/view_control/CMakeLists.txt index fbda884e8..b66dcd0ab 100644 --- a/examples/view_control/CMakeLists.txt +++ b/examples/view_control/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(ignition-rendering-view-control) -find_package(ignition-rendering4 REQUIRED) +find_package(ignition-rendering5 REQUIRED) find_package(GLUT REQUIRED) include_directories(SYSTEM ${GLUT_INCLUDE_DIRS}) diff --git a/tutorials/17_render_pass_tutorial.md b/tutorials/17_render_pass_tutorial.md index 87ae91573..f63dd44d5 100644 --- a/tutorials/17_render_pass_tutorial.md +++ b/tutorials/17_render_pass_tutorial.md @@ -23,7 +23,7 @@ Execute the example: You'll see: ```{.sh} -[Msg] Loading plugin [ignition-rendering4-ogre] +[Msg] Loading plugin [ignition-rendering5-ogre] Engine 'optix' is not supported =============================== TAB - Switch render engines diff --git a/tutorials/18_simple_demo_tutorial.md b/tutorials/18_simple_demo_tutorial.md index 572bb2239..ccca9346c 100644 --- a/tutorials/18_simple_demo_tutorial.md +++ b/tutorials/18_simple_demo_tutorial.md @@ -23,7 +23,7 @@ Execute the example: You'll see: ```{.sh} -[Msg] Loading plugin [ignition-rendering4-ogre] +[Msg] Loading plugin [ignition-rendering5-ogre] Engine 'optix' is not supported =============================== TAB - Switch render engines diff --git a/tutorials/19_text_geom_tutorial.md b/tutorials/19_text_geom_tutorial.md index 768815ae9..6ccd25ae7 100644 --- a/tutorials/19_text_geom_tutorial.md +++ b/tutorials/19_text_geom_tutorial.md @@ -23,7 +23,7 @@ Execute the example: You'll see: ```{.sh} -[Msg] Loading plugin [ignition-rendering4-ogre] +[Msg] Loading plugin [ignition-rendering5-ogre] Engine 'optix' is not supported =============================== TAB - Switch render engines diff --git a/tutorials/20_particles_tutorial.md b/tutorials/20_particles_tutorial.md index 9d9225517..43403bf14 100644 --- a/tutorials/20_particles_tutorial.md +++ b/tutorials/20_particles_tutorial.md @@ -23,7 +23,7 @@ Execute the example: You'll see: ```{.sh} -[Msg] Loading plugin [ignition-rendering4-ogre2] +[Msg] Loading plugin [ignition-rendering5-ogre2] =============================== TAB - Switch render engines ESC - Exit