Created
February 13, 2021 21:19
-
-
Save turtlesoupy/5f3e661be0ed48f31051ce7a62edcad1 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/3rdparty/filament/filament_build.cmake b/3rdparty/filament/filament_build.cmake | |
index c44008ad..21bec6ca 100644 | |
--- a/3rdparty/filament/filament_build.cmake | |
+++ b/3rdparty/filament/filament_build.cmake | |
@@ -2,8 +2,8 @@ include(ExternalProject) | |
set(FILAMENT_ROOT "${CMAKE_BINARY_DIR}/filament-binaries") | |
-set(FILAMENT_GIT_REPOSITORY "https://github.com/intel-isl/filament.git") | |
-set(FILAMENT_GIT_TAG "release") | |
+set(FILAMENT_GIT_REPOSITORY "https://github.com/google/filament.git") | |
+set(FILAMENT_GIT_TAG "main") | |
ExternalProject_Add( | |
ext_filament | |
diff --git a/3rdparty/find_dependencies.cmake b/3rdparty/find_dependencies.cmake | |
index 18900d8b..6550e323 100644 | |
--- a/3rdparty/find_dependencies.cmake | |
+++ b/3rdparty/find_dependencies.cmake | |
@@ -922,7 +922,7 @@ if(BUILD_GUI) | |
endif() | |
import_3rdparty_library(3rdparty_filament HEADER | |
INCLUDE_DIRS ${FILAMENT_ROOT}/include/ | |
- LIB_DIR ${FILAMENT_ROOT}/lib/x86_64/${FILAMENT_RUNTIME_VER} | |
+ LIB_DIR ${FILAMENT_ROOT}/lib/arm64/${FILAMENT_RUNTIME_VER} | |
LIBRARIES ${filament_LIBRARIES} | |
) | |
set(FILAMENT_MATC "${FILAMENT_ROOT}/bin/matc") | |
diff --git a/3rdparty/libpng/libpng.cmake b/3rdparty/libpng/libpng.cmake | |
index 0f314182..4bbc35d9 100644 | |
--- a/3rdparty/libpng/libpng.cmake | |
+++ b/3rdparty/libpng/libpng.cmake | |
@@ -7,6 +7,7 @@ ExternalProject_Add( | |
GIT_TAG v1.6.37 | |
UPDATE_COMMAND "" | |
CMAKE_ARGS | |
+ -DPNG_ARM_NEON=on | |
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> | |
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} | |
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} | |
diff --git a/CMakeLists.txt b/CMakeLists.txt | |
index 0c20fec9..ef557cad 100755 | |
--- a/CMakeLists.txt | |
+++ b/CMakeLists.txt | |
@@ -8,26 +8,28 @@ cmake_minimum_required(VERSION 3.18) | |
if (APPLE) | |
set (CMAKE_OSX_DEPLOYMENT_TARGET "10.14" CACHE STRING | |
"Minimum OS X deployment version" FORCE) | |
+INCLUDE_DIRECTORIES(/opt/local/include) | |
+LINK_DIRECTORIES(/opt/local/lib) | |
endif() | |
# Open3D build options | |
option(BUILD_SHARED_LIBS "Build shared libraries" OFF) | |
-option(BUILD_EXAMPLES "Build Open3D examples programs" ON ) | |
+option(BUILD_EXAMPLES "Build Open3D examples programs" OFF ) | |
option(BUILD_UNIT_TESTS "Build Open3D unit tests" OFF) | |
option(BUILD_BENCHMARKS "Build the micro benchmarks" OFF) | |
option(BUILD_PYTHON_MODULE "Build the python module" ON ) | |
option(BUILD_CUDA_MODULE "Build the CUDA module" OFF) | |
option(BUILD_CACHED_CUDA_MANAGER "Build the cached CUDA memory manager" ON ) | |
option(BUILD_GUI "Builds new GUI" ON ) | |
-option(BUILD_JUPYTER_EXTENSION "Enable Jupyter support for Open3D" OFF) | |
+option(BUILD_JUPYTER_EXTENSION "Enable Jupyter support for Open3D" ON ) | |
option(WITH_OPENMP "Use OpenMP multi-threading" ON ) | |
-option(WITH_IPPICV "Use Intel Performance Primitives" ON ) | |
+option(WITH_IPPICV "Use Intel Performance Primitives" OFF ) | |
option(ENABLE_HEADLESS_RENDERING "Use OSMesa for headless rendering" OFF) | |
option(STATIC_WINDOWS_RUNTIME "Use static (MT/MTd) Windows runtime" ON ) | |
option(GLIBCXX_USE_CXX11_ABI "Set -D_GLIBCXX_USE_CXX11_ABI=1" OFF) | |
option(BUILD_RPC_INTERFACE "Build the RPC interface" OFF) | |
# 3rd-party build options | |
-option(USE_BLAS "Use BLAS/LAPACK instead of MKL" OFF) | |
+option(USE_BLAS "Use BLAS/LAPACK instead of MKL" ON) | |
option(USE_SYSTEM_EIGEN3 "Use system pre-installed eigen3" OFF) | |
option(USE_SYSTEM_FLANN "Use system pre-installed flann" OFF) | |
option(USE_SYSTEM_FMT "Use system pre-installed fmt" OFF) | |
@@ -42,9 +44,9 @@ option(USE_SYSTEM_PYBIND11 "Use system pre-installed pybind11" OFF | |
option(USE_SYSTEM_QHULL "Use system pre-installed qhull" OFF) | |
option(USE_SYSTEM_TINYGLTF "Use system pre-installed tinygltf" OFF) | |
option(USE_SYSTEM_TINYOBJLOADER "Use system pre-installed tinyobjloader" OFF) | |
-option(BUILD_FILAMENT_FROM_SOURCE "Build filament from source" OFF) | |
-option(PREFER_OSX_HOMEBREW "Prefer Homebrew libs over frameworks" ON ) | |
-option(WITH_FAISS "Enable Faiss" ON ) | |
+option(BUILD_FILAMENT_FROM_SOURCE "Build filament from source" ON) | |
+option(PREFER_OSX_HOMEBREW "Prefer Homebrew libs over frameworks" OFF ) | |
+option(WITH_FAISS "Enable Faiss" OFF ) | |
# Sensor options | |
option(BUILD_LIBREALSENSE "Build support for Intel RealSense camera" OFF) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment