File tree Expand file tree Collapse file tree 10 files changed +18
-11
lines changed
Expand file tree Collapse file tree 10 files changed +18
-11
lines changed Original file line number Diff line number Diff line change @@ -8,6 +8,7 @@ ExternalProject_Add(
88 DOWNLOAD_DIR "${OPEN3D_THIRD_PARTY_DOWNLOAD_DIR} /civetweb"
99 UPDATE_COMMAND ""
1010 CMAKE_ARGS
11+ -DCMAKE_POLICY_VERSION_MINIMUM=3.5
1112 -DCIVETWEB_BUILD_TESTING=OFF
1213 -DCIVETWEB_ENABLE_CXX=ON
1314 -DCIVETWEB_SSL_OPENSSL_API_1_0=OFF
Original file line number Diff line number Diff line change @@ -31,6 +31,7 @@ ExternalProject_Add(
3131 -DFMT_DOC=OFF
3232 -DFMT_TEST=OFF
3333 -DFMT_FUZZ=OFF
34+ -DCMAKE_POLICY_VERSION_MINIMUM=3.5
3435 BUILD_BYPRODUCTS
3536 <INSTALL_DIR>/${Open3D_INSTALL_LIB_DIR} /${CMAKE_STATIC_LIBRARY_PREFIX}${FMT_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
3637 <INSTALL_DIR>/${Open3D_INSTALL_LIB_DIR} /${CMAKE_STATIC_LIBRARY_PREFIX}${FMT_LIB_NAME} d${CMAKE_STATIC_LIBRARY_SUFFIX}
Original file line number Diff line number Diff line change @@ -3,8 +3,8 @@ include(FetchContent)
33FetchContent_Declare(
44 ext_googletest
55 PREFIX googletest
6- URL https://github.com/google/googletest/archive/refs/tags/release -1.11 .0.tar.gz
7- URL_HASH SHA256=b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5
6+ URL https://github.com/google/googletest/releases/download/v1.16.0/googletest -1.16 .0.tar.gz
7+ URL_HASH SHA256=78c676fc63881529bf97bf9d45948d905a66833fbfa5318ea2cd7478cb98f399
88 DOWNLOAD_DIR "${OPEN3D_THIRD_PARTY_DOWNLOAD_DIR} /googletest"
99 UPDATE_COMMAND ""
1010 CONFIGURE_COMMAND ""
Original file line number Diff line number Diff line change @@ -58,6 +58,7 @@ ExternalProject_Add(
5858 DOWNLOAD_DIR "${OPEN3D_THIRD_PARTY_DOWNLOAD_DIR} /libjpeg-turbo"
5959 UPDATE_COMMAND ""
6060 CMAKE_ARGS
61+ -DCMAKE_POLICY_VERSION_MINIMUM=3.5
6162 -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
6263 -DWITH_CRT_DLL=${WITH_CRT_DLL}
6364 -DENABLE_STATIC=ON
Original file line number Diff line number Diff line change @@ -14,6 +14,7 @@ ExternalProject_Add(
1414 DOWNLOAD_DIR "${OPEN3D_THIRD_PARTY_DOWNLOAD_DIR} /libpng"
1515 UPDATE_COMMAND ""
1616 CMAKE_ARGS
17+ -DCMAKE_POLICY_VERSION_MINIMUM=3.5
1718 -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
1819 -DPNG_SHARED=OFF
1920 -DPNG_EXECUTABLES=OFF
Original file line number Diff line number Diff line change @@ -21,6 +21,7 @@ ExternalProject_Add(
2121 COMMAND ${GIT_EXECUTABLE} apply --ignore -space-change --ignore -whitespace
2222 ${CMAKE_CURRENT_LIST_DIR} /fix-macos-arm64.patch
2323 CMAKE_ARGS
24+ -DCMAKE_POLICY_VERSION_MINIMUM=3.5
2425 -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
2526 -DBUILD_SHARED_LIBS=OFF
2627 -DBUILD_EXAMPLES=OFF
Original file line number Diff line number Diff line change 11# ubuntu 12.04 LTS cmake version 2.8.7
22# ubuntu 14.04 LTS cmake version 2.8.12.2
33# ubuntu 16.04 LTS cmake version 3.5.1
4- cmake_minimum_required(VERSION 2.8.3 )
4+ cmake_minimum_required(VERSION 3.5 )
55
66project(usb)
77
Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ if(WIN32)
1919 string (APPEND lib_name -${CMAKE_VS_PLATFORM_TOOLSET} )
2020 endif ()
2121 string (APPEND lib_name -mt-s)
22- set (lib_suffix -4_3_3 )
22+ set (lib_suffix -4_3_5 )
2323else ()
2424 set (WIN_CMAKE_ARGS "" )
2525 set (lib_name zmq)
@@ -29,15 +29,16 @@ endif()
2929ExternalProject_Add(
3030 ext_zeromq
3131 PREFIX zeromq
32- URL https://github.com/zeromq/libzmq/releases/download/v4.3.3 /zeromq-4.3.3 .tar.gz
33- URL_HASH SHA256=9d9285db37ae942ed0780c016da87060497877af45094ff9e1a1ca736e3875a2
32+ URL https://github.com/zeromq/libzmq/releases/download/v4.3.5 /zeromq-4.3.5 .tar.gz
33+ URL_HASH SHA256=6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a913bfab43
3434 DOWNLOAD_DIR "${OPEN3D_THIRD_PARTY_DOWNLOAD_DIR} /zeromq"
3535 # do not update
3636 UPDATE_COMMAND ""
3737 CMAKE_ARGS
3838 # Does not seem to work. We have to directly set the flags on Windows.
3939 #-DCMAKE_POLICY_DEFAULT_CMP0091:STRING=NEW
4040 #-DCMAKE_MSVC_RUNTIME_LIBRARY:STRING=${CMAKE_MSVC_RUNTIME_LIBRARY}
41+ -DCMAKE_POLICY_VERSION_MINIMUM=3.5
4142 -DBUILD_STATIC=ON
4243 -DBUILD_SHARED=OFF
4344 -DBUILD_TESTS=OFF
@@ -58,8 +59,8 @@ ExternalProject_Add(
5859ExternalProject_Add(
5960 ext_cppzmq
6061 PREFIX zeromq
61- URL https://github.com/zeromq/cppzmq/archive/v4.7.1 .tar.gz
62- URL_HASH SHA256=9853e0437d834cbed5d3c223bf1d755cadee70e7c964c6e42c4c6783dee5d02c
62+ URL https://github.com/zeromq/cppzmq/archive/refs/tags/ v4.10.0 .tar.gz
63+ URL_HASH SHA256=c81c81bba8a7644c84932225f018b5088743a22999c6d82a2b5f5cd1e6942b74
6364 DOWNLOAD_DIR "${OPEN3D_THIRD_PARTY_DOWNLOAD_DIR} /zeromq"
6465 UPDATE_COMMAND ""
6566 CONFIGURE_COMMAND ""
Original file line number Diff line number Diff line change @@ -19,6 +19,7 @@ ExternalProject_Add(
1919 COMMAND ${GIT_EXECUTABLE} apply --ignore -space-change --ignore -whitespace
2020 ${CMAKE_CURRENT_LIST_DIR} /0001-patch-zlib-to-enable-unzip.patch
2121 CMAKE_ARGS
22+ -DCMAKE_POLICY_VERSION_MINIMUM=3.5
2223 -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
2324 # zlib needs visiible symbols for examples. Disabling example building causes
2425 # assember error in GPU CI. zlib symbols are hidden during linking.
Original file line number Diff line number Diff line change @@ -356,9 +356,7 @@ install_docs_dependencies() {
356356 command -v python
357357 python -V
358358 python -m pip install -U -q " pip==$PIP_VER "
359- # cmake 4.0 breaks librealsense. Remove restriction when librealsense is
360- # updated.
361- which cmake || python -m pip install -U -q " cmake<4.0"
359+ which cmake || python -m pip install -U -q cmake
362360 python -m pip install -U -q -r " ${OPEN3D_SOURCE_ROOT} /python/requirements_build.txt"
363361 if [[ -d " $1 " ]]; then
364362 OPEN3D_ML_ROOT=" $1 "
@@ -378,6 +376,8 @@ install_docs_dependencies() {
378376# Build documentation
379377# Usage: build_docs $DEVELOPER_BUILD
380378build_docs () {
379+ echo " Using cmake: $( command -v cmake) "
380+ cmake --version
381381 NPROC=$( nproc)
382382 echo NPROC=" $NPROC "
383383 mkdir -p build
You can’t perform that action at this time.
0 commit comments