Merged 2.5.0-beta1 into master (NO CONFLICTS FIXED)

deps/CMakeLists.txt

@@ -75,6 +75,9 @@ function(prusaslicer_add_cmake_project projectname)
     if (MSVC)
         set(_gen CMAKE_GENERATOR "${DEP_MSVC_GEN}" CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}")
         set(_build_j "/m")
+        if (${projectname} STREQUAL "OCCT")
+            set(_build_j "/m:1")
+        endif ()
     endif ()
 
     ExternalProject_Add(
@@ -190,6 +193,7 @@ include(JPEG/JPEG.cmake)
 include(TIFF/TIFF.cmake)
 include(NanoSVG/NanoSVG.cmake)
 include(wxWidgets/wxWidgets.cmake)
+include(OCCT/OCCT.cmake)
 
 set(_dep_list
     dep_Boost
@@ -201,7 +205,11 @@ set(_dep_list
     dep_OpenVDB
     dep_OpenCSG
     dep_CGAL
+<<<<<<< HEAD
     dep_Qhull
+=======
+    dep_OCCT
+>>>>>>> master_250
     ${PNG_PKG}
     ${ZLIB_PKG}
     ${EXPAT_PKG}

deps/OCCT/OCCT.cmake

@@ -0,0 +1,22 @@
+prusaslicer_add_cmake_project(OCCT
+    #LMBBS: changed version to 7.6.2
+    URL https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/V7_6_2.zip
+    URL_HASH SHA256=c696b923593e8c18d059709717dbf155b3e72fdd283c8522047a790ec3a432c5
+
+    CMAKE_ARGS
+        -DINSTALL_DIR_LAYOUT=Unix # LMBBS
+        -DBUILD_LIBRARY_TYPE=Static
+        -DUSE_TK=OFF
+        -DUSE_TBB=OFF
+        -DUSE_FREETYPE=OFF
+	    -DUSE_FFMPEG=OFF
+	    -DUSE_VTK=OFF
+	    -DUSE_FREETYPE=OFF
+	    -DBUILD_MODULE_ApplicationFramework=OFF
+        #-DBUILD_MODULE_DataExchange=OFF
+        -DBUILD_MODULE_Draw=OFF
+		-DBUILD_MODULE_FoundationClasses=OFF
+		-DBUILD_MODULE_ModelingAlgorithms=OFF
+		-DBUILD_MODULE_ModelingData=OFF
+		-DBUILD_MODULE_Visualization=OFF
+)