From 825b31fe800b8e194b53ffbcb597866fa5d55d79 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Thu, 7 Oct 2021 14:47:26 -0700 Subject: [PATCH] Bump main to 7.0.0~pre1 Signed-off-by: Louise Poubel --- .github/disabled_workflows/macos.yml | 2 +- CMakeLists.txt | 2 +- Changelog.md | 16 ++++++++++------ examples/custom_sensor/CMakeLists.txt | 4 ++-- examples/imu_noise/CMakeLists.txt | 4 ++-- examples/loop_sensor/CMakeLists.txt | 6 +++--- examples/save_image/CMakeLists.txt | 4 ++-- 7 files changed, 21 insertions(+), 17 deletions(-) diff --git a/.github/disabled_workflows/macos.yml b/.github/disabled_workflows/macos.yml index 8648ee8f..d7e1e68f 100644 --- a/.github/disabled_workflows/macos.yml +++ b/.github/disabled_workflows/macos.yml @@ -6,7 +6,7 @@ jobs: build: env: - PACKAGE: ignition-sensors6 + PACKAGE: ignition-sensors7 runs-on: macos-latest steps: - uses: actions/checkout@v2 diff --git a/CMakeLists.txt b/CMakeLists.txt index d842db55..f17cf6f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 diff --git a/Changelog.md b/Changelog.md index e1bae049..5edcf84b 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,9 @@ ## 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) @@ -7,25 +11,25 @@ 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 diff --git a/examples/custom_sensor/CMakeLists.txt b/examples/custom_sensor/CMakeLists.txt index aff5959d..4f5fa191 100644 --- a/examples/custom_sensor/CMakeLists.txt +++ b/examples/custom_sensor/CMakeLists.txt @@ -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) diff --git a/examples/imu_noise/CMakeLists.txt b/examples/imu_noise/CMakeLists.txt index 8b6c52ca..9b3186fe 100644 --- a/examples/imu_noise/CMakeLists.txt +++ b/examples/imu_noise/CMakeLists.txt @@ -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) diff --git a/examples/loop_sensor/CMakeLists.txt b/examples/loop_sensor/CMakeLists.txt index 45d9fa77..2bd87981 100644 --- a/examples/loop_sensor/CMakeLists.txt +++ b/examples/loop_sensor/CMakeLists.txt @@ -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 @@ -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) diff --git a/examples/save_image/CMakeLists.txt b/examples/save_image/CMakeLists.txt index e611b3e8..32ea0aa2 100644 --- a/examples/save_image/CMakeLists.txt +++ b/examples/save_image/CMakeLists.txt @@ -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) @@ -14,4 +14,4 @@ endif() add_executable(save_image main.cc) target_link_libraries(save_image PUBLIC - ignition-sensors6::camera) + ignition-sensors7::camera)