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 6.0.0~pre1 #735

Merged
merged 1 commit into from
Apr 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
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
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5.1 FATAL_ERROR)
#============================================================================
# Initialize the project
#============================================================================
project(ignition-gazebo5 VERSION 5.0.0)
project(ignition-gazebo6 VERSION 6.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 Gazebo 6.x

### Ignition Gazebo 6.X.X (20XX-XX-XX)

### Ignition Gazebo 6.0.0 (20XX-XX-XX)

## Ignition Gazebo 5.x

### Ignition Gazebo 5.X.X (20XX-XX-XX)
Expand Down
4 changes: 2 additions & 2 deletions examples/plugin/command_actor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ project(CommandActor)
find_package(ignition-plugin1 REQUIRED COMPONENTS register)
set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR})

find_package(ignition-gazebo5 REQUIRED)
find_package(ignition-gazebo6 REQUIRED)
add_library(CommandActor SHARED CommandActor.cc)
set_property(TARGET CommandActor PROPERTY CXX_STANDARD 17)
target_link_libraries(CommandActor
PRIVATE ignition-plugin${IGN_PLUGIN_VER}::ignition-plugin${IGN_PLUGIN_VER}
PRIVATE ignition-gazebo5::ignition-gazebo5)
PRIVATE ignition-gazebo6::ignition-gazebo6)
4 changes: 2 additions & 2 deletions examples/plugin/custom_component/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ project(CustomComponentPlugin)
find_package(ignition-plugin1 REQUIRED COMPONENTS register)
set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR})

find_package(ignition-gazebo5 REQUIRED)
find_package(ignition-gazebo6 REQUIRED)
add_library(CustomComponentPlugin SHARED
CustomComponentPlugin.cc
)
set_property(TARGET CustomComponentPlugin PROPERTY CXX_STANDARD 17)
target_link_libraries(CustomComponentPlugin
PRIVATE ignition-plugin${IGN_PLUGIN_VER}::ignition-plugin${IGN_PLUGIN_VER}
PRIVATE ignition-gazebo5::ignition-gazebo5)
PRIVATE ignition-gazebo6::ignition-gazebo6)
4 changes: 2 additions & 2 deletions examples/plugin/gui_system_plugin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ project(GuiSystemPlugin)

set(CMAKE_AUTOMOC ON)

find_package(ignition-gazebo5 REQUIRED COMPONENTS gui)
find_package(ignition-gazebo6 REQUIRED COMPONENTS gui)

QT5_ADD_RESOURCES(resources_RCC ${PROJECT_NAME}.qrc)

Expand All @@ -17,5 +17,5 @@ add_library(${PROJECT_NAME} SHARED
${resources_RCC}
)
target_link_libraries(${PROJECT_NAME}
PRIVATE ignition-gazebo5::gui
PRIVATE ignition-gazebo6::gui
)
4 changes: 2 additions & 2 deletions examples/plugin/rendering_plugins/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ target_link_libraries(${GUI_PLUGIN}
set(SERVER_PLUGIN RenderingServerPlugin)

find_package(ignition-plugin1 REQUIRED COMPONENTS register)
find_package(ignition-gazebo5 REQUIRED)
find_package(ignition-gazebo6 REQUIRED)

add_library(${SERVER_PLUGIN} SHARED ${SERVER_PLUGIN}.cc)
set_property(TARGET ${SERVER_PLUGIN} PROPERTY CXX_STANDARD 17)
target_link_libraries(${SERVER_PLUGIN}
PRIVATE
ignition-plugin1::ignition-plugin1
ignition-gazebo5::ignition-gazebo5
ignition-gazebo6::ignition-gazebo6
ignition-rendering5::ignition-rendering5
)
4 changes: 2 additions & 2 deletions examples/plugin/system_plugin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ project(SampleSystem)
find_package(ignition-plugin1 REQUIRED COMPONENTS register)
set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR})

find_package(ignition-gazebo5 REQUIRED)
find_package(ignition-gazebo6 REQUIRED)
add_library(SampleSystem SHARED SampleSystem.cc SampleSystem2.cc)
set_property(TARGET SampleSystem PROPERTY CXX_STANDARD 17)
target_link_libraries(SampleSystem
PRIVATE ignition-plugin${IGN_PLUGIN_VER}::ignition-plugin${IGN_PLUGIN_VER}
PRIVATE ignition-gazebo5::ignition-gazebo5)
PRIVATE ignition-gazebo6::ignition-gazebo6)
4 changes: 2 additions & 2 deletions examples/standalone/custom_server/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)

if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
find_package(ignition-gazebo5 REQUIRED)
set(IGN_COMMON_VER ${ignition-gazebo5_VERSION_MAJOR})
find_package(ignition-gazebo6 REQUIRED)
set(IGN_COMMON_VER ${ignition-gazebo6_VERSION_MAJOR})

add_executable(custom_server custom_server.cc)
target_link_libraries(custom_server
Expand Down
4 changes: 2 additions & 2 deletions examples/standalone/each_performance/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)

find_package(ignition-gazebo5 QUIET REQUIRED)
find_package(ignition-gazebo6 QUIET REQUIRED)

add_executable(each each.cc)
target_link_libraries(each
ignition-gazebo5::core)
ignition-gazebo6::core)

4 changes: 2 additions & 2 deletions examples/standalone/light_control/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
find_package(ignition-transport10 QUIET REQUIRED OPTIONAL_COMPONENTS log)
set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})

find_package(ignition-gazebo5 REQUIRED)
set(IGN_GAZEBO_VER ${ignition-gazebo5_VERSION_MAJOR})
find_package(ignition-gazebo6 REQUIRED)
set(IGN_GAZEBO_VER ${ignition-gazebo6_VERSION_MAJOR})

add_executable(light_control light_control.cc)
target_link_libraries(light_control
Expand Down
2 changes: 1 addition & 1 deletion tutorials/migrating_ardupilot_plugin.md
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,7 @@ In the new code we explicitly reference each Ignition package that we use:
# NEW
find_package(sdformat11 REQUIRED)
find_package(ignition-common4-all REQUIRED)
find_package(ignition-gazebo5-all REQUIRED)
find_package(ignition-gazebo6-all REQUIRED)
find_package(ignition-math6-all REQUIRED)
find_package(ignition-msgs7-all REQUIRED)
find_package(ignition-physics4-all REQUIRED)
Expand Down