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

Jump to bottom

Support msgpack versions without cmake #5624

Merged
merged 4 commits into from Dec 2, 2022
Merged

Support msgpack versions without cmake #5624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c35ae33
try msgpack from pkgconfig
cielavenir Oct 27, 2022
9d84c6b
try msgpack.pc only when msgpack-config.cmake fails
cielavenir Oct 27, 2022
f4369b0
use open3d_pkg_config_3rdparty_library properly
cielavenir Oct 27, 2022
93725b2
update CHANGELOG
cielavenir Oct 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion 3rdparty/find_dependencies.cmake
View file
Open in desktop
Expand Up @@ -1403,7 +1403,12 @@ if(USE_SYSTEM_MSGPACK)
TARGETS msgpackc
)
if(NOT 3rdparty_msgpack_FOUND)
set(USE_SYSTEM_MSGPACK OFF)
open3d_pkg_config_3rdparty_library(3rdparty_msgpack
SEARCH_ARGS msgpack
)
if(NOT 3rdparty_msgpack_FOUND)
set(USE_SYSTEM_MSGPACK OFF)
endif()
endif()
endif()
if(NOT USE_SYSTEM_MSGPACK)
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -11,6 +11,7 @@
* Reserve fragment buffer for VoxelBlockGrid operations
* Fix raycasting scene: Allow setting of number of threads that are used for building a raycasting scene
* Fix Python bindings for CUDA device synchronization, voxel grid saving (PR #5425)
* Support msgpack versions without cmake

## 0.13

Expand Down