Skip to content

Commit

Permalink
Merge branch 'main' into win_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
iche033 authored Oct 11, 2023
2 parents c875f5e + e52f97c commit 0fcf479
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 11 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.10.2 FATAL_ERROR)
#============================================================================
# Initialize the project
#============================================================================
project(gz-sensors8 VERSION 8.0.0)
project(gz-sensors9 VERSION 9.0.0)

#============================================================================
# Find gz-cmake
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 Sensors 9

### Gazebo Sensors 9.0.0 (2023-XX-XX)

## Gazebo Sensors 8

### Gazebo Sensors 8.0.0 (2023-09-29)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ models into sensor streams.

# Install

See the [installation tutorial](https://gazebosim.org/api/sensors/8/installation.html).
See the [installation tutorial](https://gazebosim.org/api/sensors/9/installation.html).

# Usage

Expand Down
4 changes: 2 additions & 2 deletions examples/custom_sensor/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)
project(odometer)

find_package(gz-cmake3 REQUIRED)
find_package(gz-sensors8 REQUIRED)
find_package(gz-sensors9 REQUIRED)

add_library(${PROJECT_NAME} SHARED Odometer.cc)
target_link_libraries(${PROJECT_NAME}
PUBLIC gz-sensors8::gz-sensors8)
PUBLIC gz-sensors9::gz-sensors9)
4 changes: 2 additions & 2 deletions examples/imu_noise/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
project(gz-sensors-noise-demo)

# Find the Gazebo Libraries used directly by the example
find_package(gz-sensors8 REQUIRED)
find_package(gz-sensors9 REQUIRED)

add_executable(sensor_noise main.cc)
target_link_libraries(sensor_noise PUBLIC gz-sensors8)
target_link_libraries(sensor_noise PUBLIC gz-sensors9)
6 changes: 3 additions & 3 deletions examples/loop_sensor/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
project(loop_sensor)

find_package(gz-sensors8 REQUIRED
find_package(gz-sensors9 REQUIRED
# Find built-in sensors
COMPONENTS
altimeter
Expand All @@ -12,10 +12,10 @@ add_subdirectory(../custom_sensor odometer)

add_executable(${PROJECT_NAME} main.cc)
target_link_libraries(${PROJECT_NAME} PUBLIC
gz-sensors8::gz-sensors8
gz-sensors9::gz-sensors9

# Link to custom sensors
odometer

# Link to built-in sensors
gz-sensors8::altimeter)
gz-sensors9::altimeter)
4 changes: 2 additions & 2 deletions examples/save_image/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(gz-sensors-camera-demo)

# Find the Gazebo Libraries used directly by the example
find_package(gz-rendering8 REQUIRED OPTIONAL_COMPONENTS ogre ogre2)
find_package(gz-sensors8 REQUIRED COMPONENTS rendering camera)
find_package(gz-sensors9 REQUIRED COMPONENTS rendering camera)

if (TARGET gz-rendering8::ogre)
add_definitions(-DWITH_OGRE)
Expand All @@ -14,4 +14,4 @@ endif()

add_executable(save_image main.cc)
target_link_libraries(save_image PUBLIC
gz-sensors8::camera)
gz-sensors9::camera)

0 comments on commit 0fcf479

Please sign in to comment.