Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,5 @@ docs/Doxyfile
docs/getting_started.rst
docs/docker.rst
docs/tensorboard.md

resources
2 changes: 1 addition & 1 deletion 3rdparty/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ A C++ library for performing fast approximate nearest neighbor searches in high
dimensional spaces
http://www.cs.ubc.ca/research/flann/
--------------------------------------------------------------------------------
GLEW 2.1.0 MIT License
GLEW 2.3.1 MIT License
A cross-platform open-source C/C++ extension loading library
http://glew.sourceforge.net/
--------------------------------------------------------------------------------
Expand Down
3 changes: 1 addition & 2 deletions 3rdparty/filament/filament_build.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ endif()
ExternalProject_Add(
ext_filament
PREFIX filament
URL https://github.com/google/filament/archive/refs/tags/v1.54.0.tar.gz
URL_HASH SHA256=f4cb4eb81e3a5d66a9612ac131d16183e118b694f4f34c051506c523a8389e8d
URL https://github.com/google/filament/archive/refs/tags/v1.57.2.tar.gz
DOWNLOAD_DIR "${OPEN3D_THIRD_PARTY_DOWNLOAD_DIR}/filament"
UPDATE_COMMAND ""
CMAKE_ARGS
Expand Down
4 changes: 2 additions & 2 deletions 3rdparty/filament/filament_download.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ else()
string(APPEND lib_dir /x86_64/md)
endif()
elseif(APPLE)
set(FILAMENT_URL https://github.com/google/filament/releases/download/v1.54.0/filament-v1.54.0-mac.tgz)
set(FILAMENT_SHA256 9b71642bd697075110579ccb55a2e8f319b05bbd89613c72567745534936186e)
set(FILAMENT_URL https://github.com/google/filament/releases/download/v1.57.2/filament-v1.57.2-mac.tgz)
set(FILAMENT_SHA256 e827a00d7433aee45397d99d98dbe7bbe78b6cc89cb76b7b105d48d5bab4d655)
else() # Linux: Check glibc version and use open3d filament binary if new (Ubuntu 20.04 and similar)
execute_process(COMMAND ldd --version OUTPUT_VARIABLE ldd_version)
string(REGEX MATCH "([0-9]+\.)+[0-9]+" glibc_version ${ldd_version})
Expand Down
18 changes: 18 additions & 0 deletions 3rdparty/find_dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,24 @@ else()
list(APPEND Open3D_3RDPARTY_PUBLIC_TARGETS_FROM_SYSTEM Open3D::3rdparty_eigen3)
endif()

# Vulkan-Headers
include(${Open3D_3RDPARTY_DIR}/vulkan_headers/vulkan_headers.cmake)
open3d_import_3rdparty_library(3rdparty_vulkan_headers
INCLUDE_DIRS ${VULKAN_HEADERS_INCLUDE_DIRS}
INCLUDE_ALL
DEPENDS ext_vulkan_headers
)
list(APPEND Open3D_3RDPARTY_PRIVATE_TARGETS_FROM_CUSTOM Open3D::3rdparty_vulkan_headers)

# Vulkan Memory Allocator
include(${Open3D_3RDPARTY_DIR}/vkmemalloc/vkmemalloc.cmake)
open3d_import_3rdparty_library(3rdparty_vkmemalloc
INCLUDE_DIRS ${VMA_INCLUDE_DIRS}
INCLUDE_ALL
DEPENDS ext_vkmemalloc ext_vmahpp
)
list(APPEND Open3D_3RDPARTY_PRIVATE_TARGETS_FROM_CUSTOM Open3D::3rdparty_vkmemalloc)

# Nanoflann
if(USE_SYSTEM_NANOFLANN)
open3d_find_package_3rdparty_library(3rdparty_nanoflann
Expand Down
73 changes: 0 additions & 73 deletions 3rdparty/glew/LICENSE

This file was deleted.

Loading
Loading