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.

Sign up for GitHub

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 gz-gui 10.0.0~pre1 #646

Merged
merged 1 commit into from
Nov 14, 2024
+26 −22
Merged

Bump main to gz-gui 10.0.0~pre1 #646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
#============================================================================
# Initialize the project
#============================================================================
project(gz-gui9 VERSION 9.0.0)
project(gz-gui10 VERSION 10.0.0)

#============================================================================
# Find gz-cmake
Expand All @@ -16,7 +16,7 @@ find_package(gz-cmake4 REQUIRED)
set(CMAKE_CXX_STANDARD 17)

set(CMAKE_CXX_STANDARD_REQUIRED ON)
gz_configure_project(VERSION_SUFFIX)
gz_configure_project(VERSION_SUFFIX pre1)

#============================================================================
# Set project-specific options
Expand Down
4 changes: 4 additions & 0 deletions Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## Gazebo GUI 10

### Gazebo GUI 10.0.0 (202X-XX-XX)

## Gazebo GUI 9

### Gazebo GUI 9.0.0 (2024-09-25)
Expand Down
4 changes: 2 additions & 2 deletions examples/plugin/custom_context_menu/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ find_package (Qt5 5.15
)

# Find the Gazebo GUI library
find_package(gz-gui9 REQUIRED)
set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR})
find_package(gz-gui10 REQUIRED)
set(GZ_GUI_VER ${gz-gui10_VERSION_MAJOR})

qt_add_resources(resources_RCC CustomContext.qrc)

Expand Down
4 changes: 2 additions & 2 deletions examples/plugin/dialog_from_plugin/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ find_package (Qt5
)

# Find the Gazebo GUI library
find_package(gz-gui9 REQUIRED)
set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR})
find_package(gz-gui10 REQUIRED)
set(GZ_GUI_VER ${gz-gui10_VERSION_MAJOR})

qt_add_resources(resources_RCC DialogFromPlugin.qrc)

Expand Down
4 changes: 2 additions & 2 deletions examples/plugin/gz_components/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ find_package (Qt5 5.15
REQUIRED
)

find_package(gz-gui9 REQUIRED)
set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR})
find_package(gz-gui10 REQUIRED)
set(GZ_GUI_VER ${gz-gui10_VERSION_MAJOR})

set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GZ-GUI_CXX_FLAGS}")

Expand Down
4 changes: 2 additions & 2 deletions examples/plugin/hello_plugin/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ find_package (Qt5 5.15
)

# Find the Gazebo GUI library
find_package(gz-gui9 REQUIRED)
set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR})
find_package(gz-gui10 REQUIRED)
set(GZ_GUI_VER ${gz-gui10_VERSION_MAJOR})

qt_add_resources(resources_RCC hello.qrc)

Expand Down
4 changes: 2 additions & 2 deletions examples/plugin/multiple_qml/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ find_package (Qt5
)

# Find the Gazebo GUI library
find_package(gz-gui9 REQUIRED)
set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR})
find_package(gz-gui10 REQUIRED)
set(GZ_GUI_VER ${gz-gui10_VERSION_MAJOR})

set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GZ-GUI_CXX_FLAGS}")

Expand Down
4 changes: 2 additions & 2 deletions examples/standalone/custom_drawer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ find_package (Qt5
)

# Find the Gazebo GUI library
find_package(gz-gui9 REQUIRED)
set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR})
find_package(gz-gui10 REQUIRED)
set(GZ_GUI_VER ${gz-gui10_VERSION_MAJOR})

qt_add_resources(resources_RCC custom_drawer.qrc)

Expand Down
4 changes: 2 additions & 2 deletions examples/standalone/dialogs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ find_package (Qt5 5.15
)

# Find the Gazebo GUI library
find_package(gz-gui9 REQUIRED)
set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR})
find_package(gz-gui10 REQUIRED)
set(GZ_GUI_VER ${gz-gui10_VERSION_MAJOR})

# Generate example
add_executable(dialogs
Expand Down
4 changes: 2 additions & 2 deletions examples/standalone/start_dialog/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ endif()

set(CMAKE_AUTOMOC ON)

find_package(gz-gui9 REQUIRED)
set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR})
find_package(gz-gui10 REQUIRED)
set(GZ_GUI_VER ${gz-gui10_VERSION_MAJOR})

set(EXEC_NAME "start_dialog")

Expand Down
4 changes: 2 additions & 2 deletions examples/standalone/window/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ find_package (Qt5 5.15
)

# Find the Gazebo GUI library
find_package(gz-gui9 REQUIRED)
set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR})
find_package(gz-gui10 REQUIRED)
set(GZ_GUI_VER ${gz-gui10_VERSION_MAJOR})

set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GZ-GUI_CXX_FLAGS}")

Expand Down
4 changes: 2 additions & 2 deletions package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="2">
<name>gz-gui9</name>
<version>9.0.0</version>
<name>gz-gui10</name>
<version>10.0.0</version>
<description>Gazebo GUI : Graphical interfaces for robotics applications</description>
<maintainer email="[email protected]">Jenn Nguyen</maintainer>
<license>Apache License 2.0</license>
Expand Down
Loading