Merge DDS to development #12008
Merge DDS to development #12008
Conversation
… send/receive buffer size
(cherry picked from commit 10174fd)
(cherry picked from commit c2bb6da)
(cherry picked from commit 74d5a35)
(cherry picked from commit 3b82832)
(cherry picked from commit 5af8805)
…void data copy
# Conflicts: # src/ds/ds-private.cpp # src/software-device.cpp # src/software-device.h # unit-tests/unit-test-config.py
# Conflicts: # src/context.cpp # src/l500/l500-serializable.cpp # unit-tests/live/fg/test-fg.py # unit-tests/unit-tests-live.cpp
| # This is possible in CMake 3.12+ with FetchContent and FetchContent_MakeAvailable in 3.14+ (meaning Ubuntu 20) | ||
| # but we need to adhere to CMake 3.10 (Ubuntu 18). | ||
| # So instead, we invoke a new CMake project just to download pybind: | ||
| configure_file( CMake/pybind11-json-download.cmake.in |
There was a problem hiding this comment.
Please integrate this fix:
https://github.com/IntelRealSense/librealsense/pull/11959/files
We need to build in linux and see we didn't ruin something here
Fix was already approved by the user
There was a problem hiding this comment.
Nir, this is the pybind11-json download, not pybind11... the changes you pointed to are in the file. Everything is as it should be.
| # Trigger the build | ||
| get_pybind11() | ||
| get_pybind11_json() |
There was a problem hiding this comment.
What is this package purpose?
There was a problem hiding this comment.
That's a small header lib that enables Python conversions to/from json objects.
| @@ -0,0 +1,62 @@ | |||
| # License: Apache 2.0. See LICENSE file in root directory. | |||
| # Copyright(c) 2022 Intel Corporation. All Rights Reserved. | |||
There was a problem hiding this comment.
Dont we want here the minimal cmake version for DDS capability?
There was a problem hiding this comment.
Kind of optional -- we have minimums all over the place, mostly needlessly.
The user will get stuck on the FastDDS CMake before they get here.
One test had to be fixed because it compared float32 with float64 (see the last commit). Otherwise not many conflicts and was fairly straightforward.
Tracked on [LRS-799]