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 7.0.0~pre1 #301

Merged
merged 1 commit into from
Oct 8, 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.10.2 FATAL_ERROR)
#============================================================================
# Initialize the project
#============================================================================
project(ignition-gui6 VERSION 6.0.0)
project(ignition-gui7 VERSION 7.0.0)

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

### Ignition Gui 7.X.X

### Ignition Gui 7.0.0 (202X-XX-XX)

### Ignition Gui 6.X.X

### Ignition Gui 6.0.0 (2021-09-XX)
Expand Down
2 changes: 1 addition & 1 deletion examples/plugin/custom_context_menu/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ find_package (Qt5
)

# Find the Ignition gui library
find_package(ignition-gui6 REQUIRED)
find_package(ignition-gui7 REQUIRED)
find_package(ignition-common4 REQUIRED)

set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IGNITION-GUI_CXX_FLAGS}")
Expand Down
2 changes: 1 addition & 1 deletion examples/plugin/dialog_from_plugin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ find_package (Qt5
)

# Find the Ignition gui library
find_package(ignition-gui6 REQUIRED)
find_package(ignition-gui7 REQUIRED)
find_package(ignition-common4 REQUIRED)

set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IGNITION-GUI_CXX_FLAGS}")
Expand Down
2 changes: 1 addition & 1 deletion examples/plugin/hello_plugin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ find_package (Qt5
)

# Find the Ignition gui library
find_package(ignition-gui6 REQUIRED)
find_package(ignition-gui7 REQUIRED)
find_package(ignition-common4 REQUIRED)

set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IGNITION-GUI_CXX_FLAGS}")
Expand Down
2 changes: 1 addition & 1 deletion examples/plugin/ign_components/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ find_package (Qt5
REQUIRED
)

find_package(ignition-gui6 REQUIRED)
find_package(ignition-gui7 REQUIRED)
find_package(ignition-common4 REQUIRED)

set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IGNITION-GUI_CXX_FLAGS}")
Expand Down
2 changes: 1 addition & 1 deletion examples/plugin/multiple_qml/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ find_package (Qt5
)

# Find the Ignition gui library
find_package(ignition-gui6 REQUIRED)
find_package(ignition-gui7 REQUIRED)
find_package(ignition-common4 REQUIRED)

set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IGNITION-GUI_CXX_FLAGS}")
Expand Down
2 changes: 1 addition & 1 deletion examples/standalone/custom_drawer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ find_package (Qt5
)

# Find the Ignition gui library
find_package(ignition-gui6 REQUIRED)
find_package(ignition-gui7 REQUIRED)

QT5_ADD_RESOURCES(resources_RCC custom_drawer.qrc)

Expand Down
2 changes: 1 addition & 1 deletion examples/standalone/dialogs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ find_package (Qt5
)

# Find the Ignition gui library
find_package(ignition-gui6 REQUIRED)
find_package(ignition-gui7 REQUIRED)

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

Expand Down
2 changes: 1 addition & 1 deletion examples/standalone/window/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ find_package (Qt5
)

# Find the Ignition gui library
find_package(ignition-gui6 REQUIRED)
find_package(ignition-gui7 REQUIRED)

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

Expand Down