Skip to content

Commit

Permalink
Bump main to 5.0.0~pre1 (#245)
Browse files Browse the repository at this point in the history
* Bump main to 5.0.0~pre1

Signed-off-by: Louise Poubel <[email protected]>

* Fix examples

Signed-off-by: Louise Poubel <[email protected]>
  • Loading branch information
chapulina authored Apr 6, 2021
1 parent b5e0511 commit d80f241
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5.1 FATAL_ERROR)
#============================================================================
# Initialize the project
#============================================================================
project(ignition-physics4 VERSION 4.0.0)
project(ignition-physics5 VERSION 5.0.0)

#============================================================================
# Find ignition-cmake
Expand Down
6 changes: 6 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## Ignition Physics 5.x

### Ignition Physics 5.x.x (20XX-XX-XX)

### Ignition Physics 5.0.0 (20XX-XX-XX)

## Ignition Physics 4.x

### Ignition Physics 4.x.x (20XX-XX-XX)
Expand Down
2 changes: 1 addition & 1 deletion examples/hello_world_loader/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 4)
set(IGN_PHYSICS_VER 5)
find_package(ignition-physics${IGN_PHYSICS_VER} REQUIRED)

add_executable(hello_world_loader hello_world_loader.cc)
Expand Down
2 changes: 1 addition & 1 deletion examples/hello_world_plugin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 4)
set(IGN_PHYSICS_VER 5)
find_package(ignition-physics${IGN_PHYSICS_VER} REQUIRED)

add_library(HelloWorldPlugin SHARED HelloWorldPlugin.cc)
Expand Down
4 changes: 2 additions & 2 deletions tutorials/02_installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,15 @@ command-line tools:
2. Run the following commands
```
brew tap osrf/simulation
brew install ignition-physics4
brew install ignition-physics5
```

## Source Installation

1. Install dependencies
```
brew tap osrf/simulation
brew install ignition-physics4 --only-dependencies
brew install ignition-physics5 --only-dependencies
```

2. Clone the repository
Expand Down
4 changes: 2 additions & 2 deletions tutorials/05_plugin_loading.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ for (const std::string &name : pluginNames)
}
```

### Setup CMakeLists.txt for building (Version: Edifice, ign-physics4)
### Setup CMakeLists.txt for building (Version: ign-physics5)

Now create a file named `CMakeLists.txt` with your favorite editor and add these
lines for finding `ign-plugin` and `ign-physics` dependencies in Edifice release:
Expand All @@ -104,7 +104,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 4)
set(IGN_PHYSICS_VER 5)
find_package(ignition-physics${IGN_PHYSICS_VER} REQUIRED)
```

Expand Down
4 changes: 2 additions & 2 deletions tutorials/07-implementing-a-physics-plugin.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,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: Edifice, ign-physics4)
### Setup CMakeLists.txt for building (Version: ign-physics5)
Now create a file named `CMakeLists.txt` with your favorite editor and add these
lines for finding `ign-plugin` and `ign-physics` dependencies for Edifice release:
Expand All @@ -128,7 +128,7 @@ lines for finding `ign-plugin` and `ign-physics` dependencies for Edifice releas
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 4)
set(IGN_PHYSICS_VER 5)
find_package(ignition-physics${IGN_PHYSICS_VER} REQUIRED)
```

Expand Down

0 comments on commit d80f241

Please sign in to comment.