From 1a170c2ceab53b50dbb1febdfee7217638e83954 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Thu, 7 Oct 2021 14:59:21 -0700 Subject: [PATCH 1/2] Bump main to 6.0.0~pre1 Signed-off-by: Louise Poubel --- CMakeLists.txt | 2 +- Changelog.md | 5 +++++ examples/hello_world_loader/CMakeLists.txt | 2 +- examples/hello_world_plugin/CMakeLists.txt | 2 +- examples/simple_plugin/CMakeLists.txt | 2 +- tutorials/07-implementing-a-physics-plugin.md | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c4654c138..3c9a45a14 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5.1 FATAL_ERROR) #============================================================================ # Initialize the project #============================================================================ -project(ignition-physics5 VERSION 5.0.0) +project(ignition-physics6 VERSION 6.0.0) #============================================================================ # Find ignition-cmake diff --git a/Changelog.md b/Changelog.md index f1d603bfc..65b9c80ef 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,8 @@ +## Ignition Physics 6.x + +### Ignition Physics 6.x.x (202X-XX-XX) + + ## Ignition Physics 5.x ### Ignition Physics 5.x.x (20XX-XX-XX) diff --git a/examples/hello_world_loader/CMakeLists.txt b/examples/hello_world_loader/CMakeLists.txt index 54c08cd48..a94a6a6ae 100644 --- a/examples/hello_world_loader/CMakeLists.txt +++ b/examples/hello_world_loader/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) set(IGN_PLUGIN_VER 1) find_package(ignition-plugin${IGN_PLUGIN_VER} 1.1 REQUIRED COMPONENTS all) -set(IGN_PHYSICS_VER 5) +set(IGN_PHYSICS_VER 6) find_package(ignition-physics${IGN_PHYSICS_VER} REQUIRED) add_executable(hello_world_loader hello_world_loader.cc) diff --git a/examples/hello_world_plugin/CMakeLists.txt b/examples/hello_world_plugin/CMakeLists.txt index b0af68868..fc9930678 100644 --- a/examples/hello_world_plugin/CMakeLists.txt +++ b/examples/hello_world_plugin/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) set(IGN_PLUGIN_VER 1) find_package(ignition-plugin${IGN_PLUGIN_VER} 1.1 REQUIRED COMPONENTS all) -set(IGN_PHYSICS_VER 5) +set(IGN_PHYSICS_VER 6) find_package(ignition-physics${IGN_PHYSICS_VER} REQUIRED) add_library(HelloWorldPlugin SHARED HelloWorldPlugin.cc) diff --git a/examples/simple_plugin/CMakeLists.txt b/examples/simple_plugin/CMakeLists.txt index afc04488d..d852ceb26 100644 --- a/examples/simple_plugin/CMakeLists.txt +++ b/examples/simple_plugin/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) set(IGN_PLUGIN_VER 1) find_package(ignition-plugin${IGN_PLUGIN_VER} 1.1 REQUIRED COMPONENTS all) -set(IGN_PHYSICS_VER 5) +set(IGN_PHYSICS_VER 6) find_package(ignition-physics${IGN_PHYSICS_VER} REQUIRED) add_library(SimplePlugin SHARED plugin.cc EntityManagementFeatures.cc) diff --git a/tutorials/07-implementing-a-physics-plugin.md b/tutorials/07-implementing-a-physics-plugin.md index d0f1c9779..bdcae43d2 100644 --- a/tutorials/07-implementing-a-physics-plugin.md +++ b/tutorials/07-implementing-a-physics-plugin.md @@ -71,7 +71,7 @@ a plugin. - The third argument is the `FeatureList`, specifying all the features that this plugin provides, i.e. `HelloWorldFeatureList` -### Setup CMakeLists.txt for building (Version: ign-physics5) +### Setup CMakeLists.txt for building (Version: ign-physics6) Now create a file named `CMakeLists.txt` with your favorite editor and add these lines for finding `ign-plugin` and `ign-physics` dependencies for the Fortress release: From 790fe33339c20c97fa22670e5da0e8584509b3a4 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Fri, 15 Oct 2021 09:42:29 -0700 Subject: [PATCH 2/2] pre1 Signed-off-by: Louise Poubel --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c7a0928ff..3c9a45a14 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ find_package(ignition-cmake2 2.8.0 REQUIRED) #============================================================================ # Configure the project #============================================================================ -ign_configure_project(VERSION_SUFFIX) +ign_configure_project(VERSION_SUFFIX pre1) #============================================================================ # Set project-specific options