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

Merged
merged 1 commit into from
Oct 15, 2021
Merged

Bump main to 7.0.0~pre1 #164

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
2 changes: 1 addition & 1 deletion .github/disabled_workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
build:

env:
PACKAGE: ignition-sensors6
PACKAGE: ignition-sensors7
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion 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.10.2 FATAL_ERROR)
#============================================================================
# Initialize the project
#============================================================================
project(ignition-sensors6 VERSION 6.0.0)
project(ignition-sensors7 VERSION 7.0.0)

#============================================================================
# Find ignition-cmake
Expand Down
16 changes: 10 additions & 6 deletions Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,35 @@
## Ignition Sensors 6

### Ignition Sensors 7.X.X

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

### Ignition Sensors 6.X.X

### Ignition Sensors 6.0.0 (2021-09-22)

1. Bumps in fortress: ign-sensors6
* [Pull request #120](https://github.com/ignitionrobotics/ign-sensors/pull/120)

1. Port codecov to new configuration
1. Port codecov to new configuration
* [Pull request #129](https://github.com/ignitionrobotics/ign-sensors/pull/129)

1. Remove deprecations: tock
1. Remove deprecations: tock
* [Pull request #141](https://github.com/ignitionrobotics/ign-sensors/pull/141)

1. Make Sensors aware of CameraPassCountPerGpuFlush & Scene::PostFrame
1. Make Sensors aware of CameraPassCountPerGpuFlush & Scene::PostFrame
* [Pull request #145](https://github.com/ignitionrobotics/ign-sensors/pull/145)

1. Remove plugin interface and support custom sensors
* [Pull request #90](https://github.com/ignitionrobotics/ign-sensors/pull/90)

1. Run ogre 1.x tests on macos
1. Run ogre 1.x tests on macos
* [Pull request #156](https://github.com/ignitionrobotics/ign-sensors/pull/156)

1. Segmentation sensor
1. Segmentation sensor
* [Pull request #133](https://github.com/ignitionrobotics/ign-sensors/pull/133)

1. Joint Force-Torque Sensor
1. Joint Force-Torque Sensor
* [Pull request #144](https://github.com/ignitionrobotics/ign-sensors/pull/144)

## Ignition Sensors 5
Expand Down
4 changes: 2 additions & 2 deletions examples/custom_sensor/CMakeLists.txt
View file
Open in desktop
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(ignition-cmake2 REQUIRED)
find_package(ignition-sensors6 REQUIRED)
find_package(ignition-sensors7 REQUIRED)

add_library(${PROJECT_NAME} SHARED Odometer.cc)
target_link_libraries(${PROJECT_NAME}
PUBLIC ignition-sensors6::ignition-sensors6)
PUBLIC ignition-sensors7::ignition-sensors7)
4 changes: 2 additions & 2 deletions examples/imu_noise/CMakeLists.txt
View file
Open in desktop
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(ignition-sensors-noise-demo)

# Find the Ignition Libraries used directly by the example
find_package(ignition-sensors6 REQUIRED)
find_package(ignition-sensors7 REQUIRED)

add_executable(sensor_noise main.cc)
target_link_libraries(sensor_noise PUBLIC ignition-sensors6)
target_link_libraries(sensor_noise PUBLIC ignition-sensors7)
6 changes: 3 additions & 3 deletions examples/loop_sensor/CMakeLists.txt
View file
Open in desktop
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(ignition-sensors6 REQUIRED
find_package(ignition-sensors7 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
ignition-sensors6::ignition-sensors6
ignition-sensors7::ignition-sensors7

# Link to custom sensors
odometer

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

# Find the Ignition Libraries used directly by the example
find_package(ignition-rendering6 REQUIRED OPTIONAL_COMPONENTS ogre ogre2)
find_package(ignition-sensors6 REQUIRED COMPONENTS rendering camera)
find_package(ignition-sensors7 REQUIRED COMPONENTS rendering camera)

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

add_executable(save_image main.cc)
target_link_libraries(save_image PUBLIC
ignition-sensors6::camera)
ignition-sensors7::camera)