-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into fix-combobox-macos
- Loading branch information
Showing
159 changed files
with
2,256 additions
and
1,106 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
# Try to use pre-installed config | ||
find_package(TBB CONFIG) | ||
if(TARGET TBB::tbb) | ||
set(TBB_FOUND TRUE) | ||
else() | ||
message(STATUS "Target TBB::tbb not defined, falling back to manual detection") | ||
find_path(TBB_INCLUDE_DIR tbb/tbb.h) | ||
find_library(TBB_LIBRARY tbb) | ||
if(TBB_INCLUDE_DIR AND TBB_LIBRARY) | ||
message(STATUS "TBB found: ${TBB_LIBRARY}") | ||
add_library(TBB::tbb UNKNOWN IMPORTED) | ||
set_target_properties(TBB::tbb PROPERTIES | ||
INTERFACE_INCLUDE_DIRECTORIES "${TBB_INCLUDE_DIR}" | ||
IMPORTED_LOCATION "${TBB_LIBRARY}" | ||
) | ||
set(TBB_FOUND TRUE) | ||
else() | ||
set(TBB_FOUND FALSE) | ||
endif() | ||
endif() | ||
|
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
# Create Debian package | ||
cmake_minimum_required(VERSION 3.8.0) | ||
project("Open3D-Debian") | ||
|
||
message(STATUS "Building package for Debian") | ||
|
||
# Install assets | ||
install(DIRECTORY "Open3D" | ||
DESTINATION share | ||
USE_SOURCE_PERMISSIONS | ||
PATTERN "Open3D/Open3D.svg" EXCLUDE | ||
PATTERN "Open3D/Open3D.desktop" EXCLUDE | ||
PATTERN "Open3D/Open3DViewer.xml" EXCLUDE | ||
PATTERN "Open3D/Open3D" EXCLUDE | ||
PATTERN "Open3D/CMakeLists.txt" EXCLUDE | ||
) | ||
install(FILES "Open3D/Open3D.desktop" DESTINATION /usr/share/applications) | ||
install(FILES "Open3D/Open3DViewer.xml" DESTINATION /usr/share/mime/packages) | ||
install(FILES "Open3D/Open3D.svg" DESTINATION /usr/share/icons/hicolor/scalable/apps) | ||
install(PROGRAMS "Open3D/Open3D" DESTINATION bin) | ||
|
||
# CPACK parameter | ||
set(CPACK_GENERATOR "DEB") | ||
set(CPACK_PACKAGE_NAME "open3d-viewer") | ||
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Open3D Viewer for 3D files") | ||
set(CPACK_PACKAGE_CONTACT "Open3D team <@PROJECT_EMAIL@>") | ||
set(CPACK_DEBIAN_PACKAGE_SECTION "Graphics") | ||
set(CPACK_PACKAGE_VERSION "@OPEN3D_VERSION@") | ||
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc++1, libgomp1, libpng16-16, libglfw3") | ||
set(CPACK_PACKAGE_HOMEPAGE_URL "@PROJECT_HOMEPAGE_URL@") | ||
|
||
# How to set cpack prefix: https://stackoverflow.com/a/7363073/1255535 | ||
set(CPACK_SET_DESTDIR true) | ||
set(CPACK_INSTALL_PREFIX /usr/local) | ||
|
||
include(CPack) |
Oops, something went wrong.