Skip to content

Commit babbd7a

Browse files
fixes for using system packages (#7177)
* require at least GLFW 3.4 for runtime platform selection API * fix linking of system OpenSSL * fix regex for clang-format parsing --------- Co-authored-by: Christian Rauch <[email protected]>
1 parent 3f0db6a commit babbd7a

File tree

2 files changed

+27
-23
lines changed

2 files changed

+27
-23
lines changed

3rdparty/find_dependencies.cmake

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -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()
869871
endif()
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)
914918
endif()
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
918922
if(USE_SYSTEM_PNG)

util/check_style.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ def parse_version(bin_path):
325325
"""
326326
version_str = subprocess.check_output([bin_path, "--version"
327327
]).decode("utf-8").strip()
328-
match = re.match("^clang-format version ([0-9.]*).*$", version_str)
328+
match = re.match("^.*clang-format version ([0-9.]*).*$", version_str)
329329
return match.group(1) if match else None
330330

331331
def parse_version_major(bin_path):

0 commit comments

Comments
 (0)