diff --git a/cpp/apps/CMakeLists.txt b/cpp/apps/CMakeLists.txt index 0beebfc9881..e0c47ea1725 100644 --- a/cpp/apps/CMakeLists.txt +++ b/cpp/apps/CMakeLists.txt @@ -131,6 +131,11 @@ macro(open3d_add_app_common SRC_DIR APP_NAME TARGET_NAME) target_link_libraries(${TARGET_NAME} PRIVATE Open3D::Open3D TBB::tbb ${ARGN}) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "apps") + if (BUILD_SYCL_MODULE) + find_package(IntelSYCL REQUIRED) # requires cmake>=3.25 on Windows + add_sycl_to_target(TARGET ${TARGET_NAME}) + endif() + open3d_link_3rdparty_libraries(${TARGET_NAME}) open3d_show_and_abort_on_warning(${TARGET_NAME}) open3d_set_global_properties(${TARGET_NAME}) @@ -141,8 +146,4 @@ if (BUILD_GUI) open3d_add_app_gui(Open3DViewer Open3D Open3DViewer) endif() -if (BUILD_SYCL_MODULE) - open3d_add_app_common(OfflineReconstruction OfflineReconstruction OfflineReconstruction Open3D::3rdparty_sycl) -else() - open3d_add_app_common(OfflineReconstruction OfflineReconstruction OfflineReconstruction) -endif() +open3d_add_app_common(OfflineReconstruction OfflineReconstruction OfflineReconstruction) diff --git a/cpp/benchmarks/CMakeLists.txt b/cpp/benchmarks/CMakeLists.txt index 3d7e1f38833..997b3dc9ab5 100644 --- a/cpp/benchmarks/CMakeLists.txt +++ b/cpp/benchmarks/CMakeLists.txt @@ -15,7 +15,8 @@ if (BUILD_CUDA_MODULE) target_link_libraries(benchmarks PRIVATE CUDA::cudart) endif() if (BUILD_SYCL_MODULE) - target_link_libraries(benchmarks PRIVATE Open3D::3rdparty_sycl) + find_package(IntelSYCL REQUIRED) # requires cmake>=3.25 on Windows + add_sycl_to_target(TARGET benchmarks) endif() open3d_show_and_abort_on_warning(benchmarks) diff --git a/docker/Dockerfile.ci b/docker/Dockerfile.ci index 4e1321c6a1b..2e58e884ebb 100755 --- a/docker/Dockerfile.ci +++ b/docker/Dockerfile.ci @@ -234,7 +234,7 @@ RUN \ && make install -j$(nproc) \ && if [ "${PACKAGE}" = "ON" ]; then make package; fi \ && if [ "${PACKAGE}" = "VIEWER" ]; then make package-Open3DViewer-deb; fi \ - && if [ "${CI:-}a" != "a" ]; then rm -rf _deps assimp embree ipp mkl mkl_install webrtc; fi + && if [ "${CI:-}a" != "a" ]; then rm -rf _deps assimp embree ipp mkl mkl_install webrtc librealsense; fi # If CI is not null or unset, remove all large build folders to save disk space # Compress ccache folder, move to / directory @@ -246,7 +246,7 @@ RUN ccache -s \ && tar -caf /${CCACHE_TAR_NAME}.tar.xz ${CCACHE_DIR_NAME} \ && if [ "${PACKAGE}" = "ON" ]; then mv /root/Open3D/build/package/open3d-devel*.tar.xz /; fi \ && if [ "${PACKAGE}" = "VIEWER" ]; then mv /root/Open3D/build/package-Open3DViewer-deb/open3d-viewer-*-Linux.deb /; fi \ - && if [ "${BUILD_SYCL_MODULE}" = "ON" && "${BUILD_SHARED_LIBS}" = "ON"]; then mv /root/Open3D/build/lib/python_package/pip_package/open3d-*.whl /; fi \ + && if [ "${BUILD_SYCL_MODULE}" = "ON" && "${BUILD_SHARED_LIBS}" = "ON" ]; then mv /root/Open3D/build/lib/python_package/pip_package/open3d-*.whl /; fi \ && ls -alh / RUN echo "Docker build done." diff --git a/docker/test2.png b/docker/test2.png deleted file mode 100644 index f03f508be40..00000000000 Binary files a/docker/test2.png and /dev/null differ