Merge branch 'main' into fix/clang-cl-windows-support

deps/Boost/Boost.cmake

@@ -10,6 +10,15 @@ if (APPLE AND CMAKE_OSX_ARCHITECTURES)
     set(_context_arch_line "-DBOOST_CONTEXT_ARCHITECTURE:STRING=${CMAKE_OSX_ARCHITECTURES}")
 endif ()
 
+# Windows ARM64: Boost.Context's default fcontext implementation assembles .asm
+# via armasm64, which trips a CMake ASM_ARMASM linker-module bug under the VS
+# generator. The winfib implementation (Windows Fiber API) avoids assembly while
+# keeping the Boost::context target that Boost.Asio's stackful coroutines need.
+set(_context_impl_line "")
+if (MSVC AND "${DEPS_ARCH}" STREQUAL "arm64")
+    set(_context_impl_line "-DBOOST_CONTEXT_IMPLEMENTATION:STRING=winfib")
+endif ()
+
 set(_options "")
 if (MSVC AND DEP_DEBUG)
     set(_options "FORWARD_CONFIG")
@@ -28,6 +37,7 @@ orcaslicer_add_cmake_project(Boost
         -DBOOST_IOSTREAMS_ENABLE_ZSTD:BOOL=OFF
         "${_context_abi_line}"
         "${_context_arch_line}"
+        "${_context_impl_line}"
 )
 
 set(DEP_Boost_DEPENDS ZLIB)

deps/OpenCV/OpenCV.cmake

@@ -1,4 +1,6 @@
-if (MSVC)
+# Intel IPP / IPP-ICV is x86/x64 only — there is no ARM64 build, so enabling it
+# leaves ~200 unresolved ippicv* externals at link time on Windows ARM64.
+if (MSVC AND NOT "${DEPS_ARCH}" STREQUAL "arm64")
     set(_use_IPP "-DWITH_IPP=ON")
     if (DEP_DEBUG)
         set(_options "FORWARD_CONFIG")

deps/OpenEXR/OpenEXR.cmake

@@ -32,6 +32,17 @@ else()
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
     set(_patch_cmd ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-OpenEXR-GCC13.patch)
+elseif (MSVC AND "${DEPS_ARCH}" STREQUAL "arm64")
+    # Windows ARM64: OpenEXR 2.5.5 hard-codes IMF_HAVE_SSE2 for any MSVC
+    # (ImfSimd.h: `_MSC_VER >= 1300`), pulling in <emmintrin.h> (x86-only) -> C1189.
+    # Patch the header to require an x86 target, and force the SSE cache vars off.
+    set(_patch_cmd ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_LIST_DIR}/patch_openexr_arm64.cmake)
+    set(_openexr_arm64_args
+        -DOPENEXR_IMF_HAVE_SSE2:BOOL=OFF
+        -DOPENEXR_IMF_HAVE_SSSE3:BOOL=OFF
+        -DILMBASE_HAVE_SSE:BOOL=OFF
+        -DILMBASE_FORCE_DISABLE_INTEL_SSE:BOOL=ON
+    )
 else ()
     set(_patch_cmd "")
 endif ()
@@ -49,6 +60,7 @@ orcaslicer_add_cmake_project(OpenEXR
         -DPYILMBASE_ENABLE:BOOL=OFF
         -DOPENEXR_VIEWERS_ENABLE:BOOL=OFF
         -DOPENEXR_BUILD_UTILS:BOOL=OFF
+        ${_openexr_arm64_args}
 )
 endif()
 

deps/OpenEXR/patch_openexr_arm64.cmake

@@ -0,0 +1,29 @@
+# Applied as PATCH_COMMAND for OpenEXR 2.5.5 on Windows ARM64.
+#
+# Root cause of the ARM64 build failure: OpenEXR/IlmImf/ImfSimd.h hard-codes
+#     #if defined __SSE2__ || (_MSC_VER >= 1300 && !_M_CEE_PURE)
+#         #define IMF_HAVE_SSE2 1
+#     #endif
+# The `_MSC_VER >= 1300` arm is true for *every* MSVC, including ARM64, so
+# IMF_HAVE_SSE2 gets defined and <emmintrin.h> (an x86-only header) is pulled
+# in -> error C1189. This is a pure-preprocessor decision, so no CMake cache
+# variable can suppress it. Patch the header to also require an x86 target.
+
+set(_simd "OpenEXR/IlmImf/ImfSimd.h")
+if(EXISTS "${_simd}")
+    file(READ "${_simd}" _content)
+    set(_old "#if defined __SSE2__ || (_MSC_VER >= 1300 && !_M_CEE_PURE)")
+    set(_new "#if (defined __SSE2__ || (_MSC_VER >= 1300 && !_M_CEE_PURE)) && (defined(_M_IX86) || defined(_M_X64) || defined(__i386__) || defined(__x86_64__))")
+    if(_content MATCHES "_M_IX86")
+        message(STATUS "[ARM64 patch] ImfSimd.h already guarded")
+    else()
+        string(REPLACE "${_old}" "${_new}" _patched "${_content}")
+        if(_patched STREQUAL _content)
+            message(FATAL_ERROR "[ARM64 patch] Failed to match SSE2 guard in ${_simd}")
+        endif()
+        file(WRITE "${_simd}" "${_patched}")
+        message(STATUS "[ARM64 patch] Guarded IMF_HAVE_SSE2 with x86 arch check in ${_simd}")
+    endif()
+else()
+    message(FATAL_ERROR "[ARM64 patch] Not found: ${_simd}")
+endif()

deps/OpenSSL/OpenSSL.cmake

@@ -6,7 +6,11 @@ if(DEFINED OPENSSL_ARCH)
     set(_cross_arch ${OPENSSL_ARCH})
 else()
     if(WIN32)
-        set(_cross_arch "VC-WIN64A")
+        if("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "ARM64")
+            set(_cross_arch "VC-WIN64-ARM")
+        else()
+            set(_cross_arch "VC-WIN64A")
+        endif()
     elseif(APPLE)
         set(_cross_arch "darwin64-${CMAKE_OSX_ARCHITECTURES}-cc")
 	endif()