Merge branch 'main' into dev/ffmpeg-player

deps/CMakeLists.txt

@@ -157,8 +157,16 @@ endif ()
 function(orcaslicer_add_cmake_project projectname)
     cmake_parse_arguments(P_ARGS "FORWARD_CONFIG" "INSTALL_DIR;BUILD_COMMAND;INSTALL_COMMAND" "CMAKE_ARGS" ${ARGN})
 
+    # MSVC is true for clang-cl as well, so the sub-build toolchain has to key on the
+    # generator. A non-Visual-Studio superbuild passes its own generator down, and with
+    # it the CMAKE_C_COMPILER / CMAKE_CXX_COMPILER forwarded below.
+    set(_dep_msvc_gen FALSE)
+    if (MSVC AND CMAKE_GENERATOR MATCHES "Visual Studio")
+        set(_dep_msvc_gen TRUE)
+    endif ()
+
     set(_configs_line -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE})
-    if (_is_multi OR MSVC)
+    if (_is_multi OR _dep_msvc_gen)
         if (P_ARGS_FORWARD_CONFIG)
             set(_configs_line -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE})
         elseif (ORCA_INCLUDE_DEBUG_INFO AND NOT DEP_DEBUG)
@@ -174,7 +182,7 @@ function(orcaslicer_add_cmake_project projectname)
         set(_target_config "Release")
     endif()
 
-    if (MSVC)
+    if (_dep_msvc_gen)
       set(_gen CMAKE_GENERATOR "${DEP_MSVC_GEN}" CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}")
     else()
       set(_gen "")
@@ -182,7 +190,7 @@ function(orcaslicer_add_cmake_project projectname)
 
     if ($ENV{CMAKE_BUILD_PARALLEL_LEVEL})
       set(_build_j "")  # assume environment will control --build parallel setting
-    elseif(MSVC)
+    elseif(_dep_msvc_gen)
       set(_build_j "/m")
     else()
       set(_build_j "-j${NPROC}")