Skip to content

Commit dca0ef8

Browse files
committed
vtd: Migrate open-simulation-interface to Conan 2.0 compatibility
The packages are now fully forward compatible with those from the Conan Center Index. This means we can swap with other versions of open-simulation-interface from the CCI without any other changes. BREAKING CHANGES: - Conan recipe requires Conan >= 1.60 - When including library in CMakeLists.txt, you now need to use: find_package(open_simulation_interface REQUIRED) - When referring to target in CMakeLists.txt, you need to refer to: open_simulation_interface::open_simulation_interface - When including headers, the osi headers are now in the osi3 folder: #include <osi3/osi_ground_truth.pb.h>
1 parent 7bea95b commit dca0ef8

22 files changed

+655
-270
lines changed

optional/vtd/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ find_package(vtd-api REQUIRED)
77
find_package(cloe-runtime REQUIRED)
88
find_package(cloe-models REQUIRED)
99
find_package(Boost REQUIRED)
10-
find_package(open-simulation-interface REQUIRED)
10+
find_package(open_simulation_interface REQUIRED)
1111

1212
add_library(vtd-object-lib STATIC
1313
src/omni_sensor_component.cpp
@@ -28,7 +28,7 @@ target_link_libraries(vtd-object-lib
2828
cloe::runtime
2929
cloe::models
3030
Boost::boost
31-
open-simulation-interface::open-simulation-interface
31+
open_simulation_interface::open_simulation_interface
3232
)
3333

3434
set_target_properties(vtd-object-lib PROPERTIES

optional/vtd/src/osi_ground_truth.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#include <cloe/simulator.hpp> // for ModelError
2626

27-
#include "osi_object.pb.h" // for MovingObject
27+
#include <osi3/osi_object.pb.h> // for MovingObject
2828

2929
namespace osii {
3030

optional/vtd/src/osi_ground_truth.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626

2727
#include <cloe/simulator.hpp> // for ModelError
2828

29-
#include "osi_groundtruth.pb.h" // for GroundTruth
30-
#include "osi_object.pb.h" // for MovingObject
29+
#include <osi3/osi_groundtruth.pb.h> // for GroundTruth
30+
#include <osi3/osi_object.pb.h> // for MovingObject
3131

3232
#include "osi_utils.hpp" // for osi_require, ..
3333

optional/vtd/src/osi_omni_sensor.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
#include <cloe/simulator.hpp> // for ModelError
3636
#include <cloe/utility/geometry.hpp> // for quaternion_from_rpy
3737

38-
#include "osi_common.pb.h" // for Timestamp, Identifier, BaseMoving, ..
39-
#include "osi_detectedobject.pb.h" // for DetectedMovingObject
40-
#include "osi_hostvehicledata.pb.h" // for HostVehicleData
41-
#include "osi_object.pb.h" // for MovingObject
42-
#include "osi_sensordata.pb.h" // for SensorData, DetectedEntityHeader
43-
#include "osi_sensorview.pb.h" // for SensorView
38+
#include <osi3/osi_common.pb.h> // for Timestamp, Identifier, BaseMoving, ..
39+
#include <osi3/osi_detectedobject.pb.h> // for DetectedMovingObject
40+
#include <osi3/osi_hostvehicledata.pb.h> // for HostVehicleData
41+
#include <osi3/osi_object.pb.h> // for MovingObject
42+
#include <osi3/osi_sensordata.pb.h> // for SensorData, DetectedEntityHeader
43+
#include <osi3/osi_sensorview.pb.h> // for SensorView
4444

4545
#include "osi_ground_truth.hpp" // for OsiGroundTruth
4646
#include "osi_utils.hpp" // for osi_require, ..

optional/vtd/src/osi_omni_sensor.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
#include <cloe/simulator.hpp> // for ModelError
3636
#include <cloe/sync.hpp> // for Sync
3737

38-
#include "osi_common.pb.h" // for Timestamp, Identifier, BaseMoving, ..
39-
#include "osi_detectedobject.pb.h" // for DetectedMovingObject
40-
#include "osi_hostvehicledata.pb.h" // for HostVehicleData
41-
#include "osi_object.pb.h" // for MovingObject
42-
#include "osi_sensordata.pb.h" // for SensorData, DetectedEntityHeader
38+
#include <osi3/osi_common.pb.h> // for Timestamp, Identifier, BaseMoving, ..
39+
#include <osi3/osi_detectedobject.pb.h> // for DetectedMovingObject
40+
#include <osi3/osi_hostvehicledata.pb.h> // for HostVehicleData
41+
#include <osi3/osi_object.pb.h> // for MovingObject
42+
#include <osi3/osi_sensordata.pb.h> // for SensorData, DetectedEntityHeader
4343

4444
#include "osi_ground_truth.hpp" // for OsiGroundTruth
4545
#include "osi_transceiver.hpp" // for OsiTransceiver

optional/vtd/src/osi_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
#include <cloe/component/object.hpp> // for Object
3232
#include <cloe/utility/geometry.hpp> // for quaternion_from_rpy
3333

34-
#include "osi_common.pb.h" // for Orientation3D, BaseMoving, ..
35-
#include "osi_object.pb.h" // for MovingObject
34+
#include <osi3/osi_common.pb.h> // for Orientation3D, BaseMoving, ..
35+
#include <osi3/osi_object.pb.h> // for MovingObject
3636

3737
#include "osi_omni_sensor.hpp" // for transform_ego_coord_from_osi_data, ...
3838
#include "osi_utils.hpp" // for pose_to_osi_position_orientation, ...

optional/vtd/src/osi_transceiver.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#include <cloe/core.hpp> // for Json, Error
2929

30-
#include <osi_sensordata.pb.h> // for SensorData
30+
#include <osi3/osi_sensordata.pb.h> // for SensorData
3131

3232
namespace osii {
3333

optional/vtd/src/osi_transceiver_tcp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include <google/protobuf/io/coded_stream.h> // for CodedInputStream
3232
#include <google/protobuf/io/zero_copy_stream_impl_lite.h> // for ArrayInputStream
3333

34-
#include "osi_sensordata.pb.h" // for SensorData
34+
#include <osi3/osi_sensordata.pb.h> // for SensorData
3535

3636
namespace osii {
3737

optional/vtd/src/osi_transceiver_tcp.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include <cloe/core.hpp> // for Json, Logger
3232
#include <cloe/utility/tcp_transceiver.hpp> // for TcpTransceiver
3333

34-
#include "osi_sensordata.pb.h" // for SensorData
34+
#include <osi3/osi_sensordata.pb.h> // for SensorData
3535

3636
#include "osi_transceiver.hpp" // for OsiTransceiver
3737
#include "osi_utils.hpp" // for osi_logger

optional/vtd/src/osi_utils.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030

3131
#include <cloe/utility/geometry.hpp> // for quaternion_from_rpy
3232

33-
#include "osi_common.pb.h" // for Timestamp, Identifier, BaseMoving, ..
34-
#include "osi_sensordata.pb.h" // for SensorData, DetectedEntityHeader
33+
#include <osi3/osi_common.pb.h> // for Timestamp, Identifier, BaseMoving, ..
34+
#include <osi3/osi_sensordata.pb.h> // for SensorData, DetectedEntityHeader
3535

3636
namespace osii {
3737

0 commit comments

Comments
 (0)