summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam J. Stewart <ajstewart426@gmail.com>2022-01-17 05:54:22 -0600
committerGitHub <noreply@github.com>2022-01-17 12:54:22 +0100
commit6c4e765f40288e1fbfd2d30993124bccc8697381 (patch)
tree27cc66d467fa212ef5edafe36d7b2981b8addf1f
parente7c9f05cd9c6a4032c40daeda1d62523305fd296 (diff)
downloadspack-6c4e765f40288e1fbfd2d30993124bccc8697381.tar.gz
spack-6c4e765f40288e1fbfd2d30993124bccc8697381.tar.bz2
spack-6c4e765f40288e1fbfd2d30993124bccc8697381.tar.xz
spack-6c4e765f40288e1fbfd2d30993124bccc8697381.zip
Open3D: use Spack-installed 3rd party deps when possible (#28422)
-rw-r--r--var/spack/repos/builtin/packages/open3d/package.py37
1 files changed, 20 insertions, 17 deletions
diff --git a/var/spack/repos/builtin/packages/open3d/package.py b/var/spack/repos/builtin/packages/open3d/package.py
index 65430910ad..7f92c0b5f7 100644
--- a/var/spack/repos/builtin/packages/open3d/package.py
+++ b/var/spack/repos/builtin/packages/open3d/package.py
@@ -23,18 +23,19 @@ class Open3d(CMakePackage, CudaPackage):
depends_on('cmake@3.19:', type='build')
# https://github.com/isl-org/Open3D/issues/3762
- depends_on('llvm')
- # depends_on('eigen')
- # depends_on('flann')
+ # https://github.com/isl-org/Open3D/issues/4570
+ depends_on('llvm@7:+clang+libcxx')
+ depends_on('eigen')
+ depends_on('flann')
# depends_on('fmt')
- # depends_on('glew')
- # depends_on('glfw')
+ depends_on('glew')
+ depends_on('glfw')
# depends_on('imgui')
- # depends_on('jpeg')
+ depends_on('jpeg')
# depends_on('liblzf')
- # depends_on('libpng')
- # depends_on('py-pybind11')
- # depends_on('qhull')
+ depends_on('libpng')
+ depends_on('py-pybind11')
+ depends_on('qhull')
# depends_on('tinygltf')
# depends_on('tinyobjloader')
@@ -61,21 +62,23 @@ class Open3d(CMakePackage, CudaPackage):
self.define('BUILD_UNIT_TESTS', self.run_tests),
self.define_from_variant('BUILD_PYTHON_MODULE', 'python'),
self.define_from_variant('BUILD_CUDA_MODULE', 'cuda'),
+ # https://github.com/isl-org/Open3D/issues/4570
+ # self.define('BUILD_FILAMENT_FROM_SOURCE', 'ON'),
# Use Spack-installed dependencies instead of vendored dependencies
# Numerous issues with using externally installed dependencies:
# https://github.com/isl-org/Open3D/issues/4333
# https://github.com/isl-org/Open3D/issues/4360
- # self.define('USE_SYSTEM_EIGEN3', True),
- # self.define('USE_SYSTEM_FLANN', True),
+ self.define('USE_SYSTEM_EIGEN3', True),
+ self.define('USE_SYSTEM_FLANN', True),
# self.define('USE_SYSTEM_FMT', True),
- # self.define('USE_SYSTEM_GLEW', True),
- # self.define('USE_SYSTEM_GLFW', True),
+ self.define('USE_SYSTEM_GLEW', True),
+ self.define('USE_SYSTEM_GLFW', True),
# self.define('USE_SYSTEM_IMGUI', True),
- # self.define('USE_SYSTEM_JPEG', True),
+ self.define('USE_SYSTEM_JPEG', True),
# self.define('USE_SYSTEM_LIBLZF', True),
- # self.define('USE_SYSTEM_PNG', True),
- # self.define('USE_SYSTEM_PYBIND11', True),
- # self.define('USE_SYSTEM_QHULL', True),
+ self.define('USE_SYSTEM_PNG', True),
+ self.define('USE_SYSTEM_PYBIND11', True),
+ self.define('USE_SYSTEM_QHULL', True),
# self.define('USE_SYSTEM_TINYGLTF', True),
# self.define('USE_SYSTEM_TINYOBJLOADER', True),
]