Merge branch 'main' into cad-mainline

deps/CMakeLists.txt

@@ -423,6 +423,7 @@ endif ()
 include(OCCT/OCCT.cmake)
 include(OpenCV/OpenCV.cmake)
 include(python3/python3.cmake)
+include(wxInspector/wxInspector.cmake)
 
 set(_dep_list
     dep_Boost
@@ -446,6 +447,7 @@ set(_dep_list
     ${EXPAT_PKG}
     dep_libnoise
     dep_python3
+    dep_wxInspector
     )
 
 if (MSVC)

deps/OpenSSL/OpenSSL.cmake

@@ -52,6 +52,14 @@ ExternalProject_Add(dep_OpenSSL
 	CONFIGURE_COMMAND ${_conf_cmd} ${_cross_arch}
         "--openssldir=${DESTDIR}"
         "--prefix=${DESTDIR}"
+        # OpenSSL's linux-x86_64 target sets multilib=64, so it installs to
+        # <prefix>/lib64 while every other dep uses <prefix>/lib. CPython's
+        # --with-openssl only ever emits -L<dir>/lib, so it misses the bundled
+        # static libs and silently links the system OpenSSL instead -- which,
+        # against 1.1.1w headers, leaves _ssl.so with an undefined
+        # SSL_get_peer_certificate (removed in OpenSSL 3.x). Pin libdir so the
+        # prefix stays single-layout.
+        "--libdir=lib"
         ${_cross_comp_prefix_line}
         no-shared
         no-asm

deps/wxInspector/wxInspector.cmake

@@ -0,0 +1,13 @@
+orcaslicer_add_cmake_project(
+    wxInspector
+    URL https://github.com/Noisyfox/wxInspector/archive/refs/tags/v1.0.0.zip
+    URL_HASH SHA256=0ba163956f2d468b19a91b96c5aba66ee9610843ea41dda628ea44cdafde7db7
+    DEPENDS ${WXWIDGETS_PKG}
+    CMAKE_ARGS
+        -DCMAKE_CXX_FLAGS="-DwxDEBUG_LEVEL=0"
+        -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+)
+
+if (MSVC)
+    add_debug_dep(dep_wxInspector)
+endif ()

deps/wxWidgets/wxWidgets.cmake

@@ -26,6 +26,7 @@ orcaslicer_add_cmake_project(
     GIT_REPOSITORY "https://github.com/SoftFever/Orca-deps-wxWidgets"
     GIT_TAG v3.3.2
     GIT_SHALLOW ON
+    GIT_SUBMODULES 3rdparty/catch 3rdparty/pcre 3rdparty/libwebp
     DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} ${JPEG_PKG}
     CMAKE_ARGS
         -DwxBUILD_PRECOMP=ON