Skip to content

Commit 997f04e

Browse files
authored
Update jinja2, fix Draw example undefined references (#7251)
* Fix jinj2 security issue (dependabot) * Fix CUDA undefined errors in Draw example on Linux. [Not fixed on Windows]
1 parent babbd7a commit 997f04e

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

.github/workflows/ubuntu-wheel.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
name: Test wheel CPU
124124
permissions:
125125
contents: read
126-
runs-on: ubuntu-20.04
126+
runs-on: ubuntu-22.04
127127
needs: [build-wheel]
128128
strategy:
129129
fail-fast: false

docker/Dockerfile.ci

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,10 @@ RUN python --version && pip --version
110110
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
111111

112112
# Dependencies: cmake
113-
ENV PATH=${HOME}/${CMAKE_VERSION}/bin:${PATH}
113+
ENV PATH=/opt/${CMAKE_VERSION}/bin:${PATH}
114114
RUN CMAKE_VERSION_NUMBERS=$(echo "${CMAKE_VERSION}" | cut -d"-" -f2) \
115115
&& wget -q https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION_NUMBERS}/${CMAKE_VERSION}.tar.gz \
116-
&& tar -xf ${CMAKE_VERSION}.tar.gz \
117-
&& cp -ar ${CMAKE_VERSION} ${HOME} \
116+
&& tar -C /opt -xf ${CMAKE_VERSION}.tar.gz \
118117
&& cmake --version
119118

120119
# Dependencies: ccache
@@ -189,6 +188,7 @@ RUN mkdir -p /etc/apt/keyrings \
189188
&& npm install -g yarn \
190189
&& yarn --version
191190

191+
192192
# Build all
193193
RUN \
194194
if [ "${BUILD_SYCL_MODULE}" = "ON" ]; then \

docs/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
docutils==0.20.1
22
furo==2023.9.10
3-
jinja2==3.1.5
3+
jinja2>=3.1.6
44
m2r2==0.3.3.post2
55
matplotlib==3.7.3
66
nbsphinx==0.9.3

examples/cmake/open3d-cmake-external-project/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ExternalProject_Add(
4040
ExternalProject_Get_Property(external_open3d INSTALL_DIR)
4141
add_library(Open3DHelper INTERFACE)
4242
add_dependencies(Open3DHelper external_open3d)
43-
target_compile_features(Open3DHelper INTERFACE cxx_std_14)
43+
target_compile_features(Open3DHelper INTERFACE cxx_std_17)
4444
target_compile_definitions(Open3DHelper INTERFACE _GLIBCXX_USE_CXX11_ABI=$<BOOL:${GLIBCXX_USE_CXX11_ABI}>)
4545
target_include_directories(Open3DHelper INTERFACE "${INSTALL_DIR}/include" "${INSTALL_DIR}/include/open3d/3rdparty")
4646
target_link_directories(Open3DHelper INTERFACE "${INSTALL_DIR}/lib")

examples/cmake/open3d-cmake-find-package/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ endif()
1515

1616
# Find installed Open3D, which exports Open3D::Open3D
1717
find_package(Open3D REQUIRED)
18+
if (TARGET Open3D::3rdparty_cublas)
19+
enable_language(CUDA)
20+
set(CMAKE_CUDA_STANDARD 17)
21+
endif()
1822

1923
add_executable(Draw)
2024
target_sources(Draw PRIVATE Draw.cpp)

0 commit comments

Comments
 (0)