@@ -669,6 +669,8 @@ if(USE_SYSTEM_GLFW)
669669 open3d_find_package_3rdparty_library(3rdparty_glfw
670670 HEADER
671671 PACKAGE glfw3
672+ VERSION 3.4
673+ REQUIRED
672674 TARGETS glfw
673675 )
674676 if (NOT 3rdparty_glfw_FOUND)
@@ -867,29 +869,31 @@ if(USE_SYSTEM_CURL)
867869 set (USE_SYSTEM_CURL OFF )
868870 endif ()
869871endif ()
870- if (NOT USE_SYSTEM_CURL)
871- if (USE_SYSTEM_OPENSSL)
872- open3d_find_package_3rdparty_library(3rdparty_openssl
873- PACKAGE OpenSSL
874- TARGETS OpenSSL::Crypto
875- )
876- if (NOT 3rdparty_openssl_FOUND)
877- set (USE_SYSTEM_OPENSSL OFF )
878- endif ()
879- endif ()
880- if (NOT USE_SYSTEM_OPENSSL)
881- # BoringSSL
882- include (${Open3D_3RDPARTY_DIR} /boringssl/boringssl.cmake)
883- open3d_import_3rdparty_library(3rdparty_openssl
884- INCLUDE_DIRS ${BORINGSSL_INCLUDE_DIRS}
885- INCLUDE_ALL
886- INCLUDE_DIRS ${BORINGSSL_INCLUDE_DIRS}
887- LIB_DIR ${BORINGSSL_LIB_DIR}
888- LIBRARIES ${BORINGSSL_LIBRARIES}
889- DEPENDS ext_zlib ext_boringssl
890- )
872+
873+ if (USE_SYSTEM_OPENSSL)
874+ open3d_find_package_3rdparty_library(3rdparty_openssl
875+ PACKAGE OpenSSL
876+ REQUIRED
877+ TARGETS OpenSSL::Crypto
878+ )
879+ if (NOT 3rdparty_openssl_FOUND)
880+ set (USE_SYSTEM_OPENSSL OFF )
891881 endif ()
882+ endif ()
883+ if (NOT USE_SYSTEM_OPENSSL)
884+ # BoringSSL
885+ include (${Open3D_3RDPARTY_DIR} /boringssl/boringssl.cmake)
886+ open3d_import_3rdparty_library(3rdparty_openssl
887+ INCLUDE_DIRS ${BORINGSSL_INCLUDE_DIRS}
888+ INCLUDE_ALL
889+ INCLUDE_DIRS ${BORINGSSL_INCLUDE_DIRS}
890+ LIB_DIR ${BORINGSSL_LIB_DIR}
891+ LIBRARIES ${BORINGSSL_LIBRARIES}
892+ DEPENDS ext_zlib ext_boringssl
893+ )
894+ endif ()
892895
896+ if (NOT USE_SYSTEM_CURL)
893897 include (${Open3D_3RDPARTY_DIR} /curl/curl.cmake)
894898 open3d_import_3rdparty_library(3rdparty_curl
895899 INCLUDE_DIRS ${CURL_INCLUDE_DIRS}
@@ -912,7 +916,7 @@ if(NOT USE_SYSTEM_CURL)
912916 endif ()
913917 target_link_libraries (3rdparty_curl INTERFACE 3rdparty_openssl)
914918endif ()
915- list (APPEND Open3D_3RDPARTY_PRIVATE_TARGETS_FROM_CUSTOM Open3D::3rdparty_curl)
919+ list (APPEND Open3D_3RDPARTY_PRIVATE_TARGETS_FROM_CUSTOM Open3D::3rdparty_curl Open3D::3rdparty_openssl )
916920
917921# PNG
918922if (USE_SYSTEM_PNG)
0 commit comments