Skip to content

Commit

Permalink
Bump main to gz-common 7.0.0~pre1 (#648)
Browse files Browse the repository at this point in the history
Signed-off-by: Carlos Agüero <[email protected]>
  • Loading branch information
caguero authored Oct 10, 2024
1 parent d0b6cfa commit 8f3bed7
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 10 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
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-common6 VERSION 6.0.0)
project(gz-common7 VERSION 7.0.0)
set(GZ_COMMON_VER ${PROJECT_VERSION_MAJOR})

#============================================================================
Expand All @@ -18,7 +18,7 @@ set(GZ_CMAKE_VER ${gz-cmake4_VERSION_MAJOR})
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

gz_configure_project(VERSION_SUFFIX pre2)
gz_configure_project(VERSION_SUFFIX pre1)

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

## Gazebo Common 7.0.0 (20XX-XX-XX)

## Gazebo Common 6.x

## Gazebo Common 6.0.0 (2024-09-25)
Expand Down
4 changes: 2 additions & 2 deletions examples/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
project(gz-common-examples)

# Find the gz-common library
find_package(gz-common6 QUIET REQUIRED COMPONENTS events profiler)
set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR})
find_package(gz-common7 QUIET REQUIRED COMPONENTS events profiler)
set(GZ_COMMON_VER ${gz-common7_VERSION_MAJOR})

add_executable(assert_example assert_example.cc)
target_link_libraries(assert_example gz-common${GZ_COMMON_VER}::core)
Expand Down
4 changes: 2 additions & 2 deletions package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>gz-common6</name>
<version>6.0.0</version>
<name>gz-common7</name>
<version>7.0.0</version>
<description>Gazebo Common : AV, Graphics, Events, and much more.</description>
<maintainer email="[email protected]">Nate Koenig</maintainer>
<license>Apache License 2.0</license>
Expand Down
8 changes: 4 additions & 4 deletions tutorials/profiler.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ enabled at compile time in order to function.
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
# Find the gz-common library
find_package(gz-common6 QUIET REQUIRED COMPONENTS profiler)
find_package(gz-common7 QUIET REQUIRED COMPONENTS profiler)
add_executable(profiler_example profiler.cc)
target_link_libraries(profiler_example gz-common6::profiler)
target_link_libraries(profiler_example gz-common7::profiler)
# Enable the profiler for the example
target_compile_definitions(profiler_example PUBLIC "GZ_PROFILER_ENABLE=1")
```
Expand Down Expand Up @@ -99,10 +99,10 @@ xdg-open $SOURCE_DIR/gz-common/profiler/src/Remotery/vis/index.html
# Use the installation path (Linux)
# This may vary depending on where you have choosen to install
xdg-open /usr/share/gz/gz-common6/profiler_vis/index.html
xdg-open /usr/share/gz/gz-common7/profiler_vis/index.html
# Use the installation path (macOS)
open /usr/share/gz/gz-common6/profiler_vis/index.html
open /usr/share/gz/gz-common7/profiler_vis/index.html
# Inside a Docker container with port 8000 exposed
# 1. Find your container's IP with 'ifconfig'
Expand Down

0 comments on commit 8f3bed7

Please sign in to comment.