-
-
Notifications
You must be signed in to change notification settings - Fork 939
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into pr-alternative-reduce-solid-wall-infill
- Loading branch information
Showing
104 changed files
with
776 additions
and
507 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,203 +1,25 @@ | ||
| include(ExternalProject) | ||
|
|
||
| # Use boost 1.78 for Windows, to support VS2022 | ||
| if (WIN32) | ||
| set(_boost_url "https://github.com/SoftFever/OrcaSlicer_deps/releases/download/boost/boost_1_78_0.tar.gz") | ||
| set(_boost_hash 94CED8B72956591C4775AE2207A9763D3600B30D9D7446562C552F0A14A63BE7) | ||
| set(_bootstrap_cmd bootstrap.bat) | ||
| set(_build_cmd b2.exe) | ||
| else() | ||
| set(_boost_url "https://github.com/SoftFever/OrcaSlicer_deps/releases/download/boost/boost_1_75_0.tar.gz") | ||
| set(_boost_hash AEB26F80E80945E82EE93E5939BAEBDCA47B9DEE80A07D3144BE1E1A6A66DD6A) | ||
| set(_bootstrap_cmd ./bootstrap.sh) | ||
| set(_build_cmd ./b2) | ||
| endif() | ||
|
|
||
| set(_patch_command ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/common.jam ./tools/build/src/tools/common.jam) | ||
|
|
||
| if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") | ||
| configure_file(${CMAKE_CURRENT_LIST_DIR}/user-config.jam boost-user-config.jam) | ||
| set(_boost_toolset gcc) | ||
| set(_patch_command ${_patch_command} && ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/boost-user-config.jam ./tools/build/src/tools/user-config.jam) | ||
| elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") | ||
| # https://cmake.org/cmake/help/latest/variable/MSVC_VERSION.html | ||
| if (MSVC_VERSION EQUAL 1800) | ||
| # 1800 = VS 12.0 (v120 toolset) | ||
| set(_boost_toolset "msvc-12.0") | ||
| elseif (MSVC_VERSION EQUAL 1900) | ||
| # 1900 = VS 14.0 (v140 toolset) | ||
| set(_boost_toolset "msvc-14.0") | ||
| elseif (MSVC_VERSION LESS 1920) | ||
| # 1910-1919 = VS 15.0 (v141 toolset) | ||
| set(_boost_toolset "msvc-14.1") | ||
| elseif (MSVC_VERSION LESS 1930) | ||
| # 1920-1929 = VS 16.0 (v142 toolset) | ||
| set(_boost_toolset "msvc-14.2") | ||
| elseif (MSVC_VERSION LESS 1940) | ||
| # 1930-1939 = VS 17.0 (v143 toolset) | ||
| set(_boost_toolset "msvc-14.3") | ||
| else () | ||
| message(FATAL_ERROR "Unsupported MSVC version") | ||
| set(_context_abi_line "") | ||
| set(_context_arch_line "") | ||
| if (APPLE AND CMAKE_OSX_ARCHITECTURES) | ||
| if (CMAKE_OSX_ARCHITECTURES MATCHES "x86") | ||
| set(_context_abi_line "-DBOOST_CONTEXT_ABI:STRING=sysv") | ||
| elseif (CMAKE_OSX_ARCHITECTURES MATCHES "arm") | ||
| set (_context_abi_line "-DBOOST_CONTEXT_ABI:STRING=aapcs") | ||
| endif () | ||
| elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") | ||
| if (WIN32) | ||
| set(_boost_toolset "clang-win") | ||
| else() | ||
| set(_boost_toolset "clang") | ||
| endif() | ||
| elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel") | ||
| set(_boost_toolset "intel") | ||
| elseif (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") | ||
| set(_boost_toolset "clang") | ||
| endif() | ||
|
|
||
| message(STATUS "Deduced boost toolset: ${_boost_toolset} based on ${CMAKE_CXX_COMPILER_ID} compiler") | ||
|
|
||
| set(_libs "") | ||
| foreach(_comp ${DEP_Boost_COMPONENTS}) | ||
| list(APPEND _libs "--with-${_comp}") | ||
| endforeach() | ||
|
|
||
| if (BUILD_SHARED_LIBS) | ||
| set(_link shared) | ||
| else() | ||
| set(_link static) | ||
| endif() | ||
|
|
||
| set(_bits "") | ||
| if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8") | ||
| set(_bits 64) | ||
| elseif ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4") | ||
| set(_bits 32) | ||
| endif () | ||
|
|
||
| include(ProcessorCount) | ||
| ProcessorCount(NPROC) | ||
| file(TO_NATIVE_PATH ${DESTDIR}/usr/local/ _prefix) | ||
|
|
||
|
|
||
| set(_boost_variants "") | ||
| if(CMAKE_BUILD_TYPE) | ||
| list(APPEND CMAKE_CONFIGURATION_TYPES ${CMAKE_BUILD_TYPE}) | ||
| list(REMOVE_DUPLICATES CMAKE_CONFIGURATION_TYPES) | ||
| endif() | ||
| list(FIND CMAKE_CONFIGURATION_TYPES "Release" _cfg_rel) | ||
| list(FIND CMAKE_CONFIGURATION_TYPES "RelWithDebInfo" _cfg_relwdeb) | ||
| list(FIND CMAKE_CONFIGURATION_TYPES "MinSizeRel" _cfg_minsizerel) | ||
| list(FIND CMAKE_CONFIGURATION_TYPES "Debug" _cfg_deb) | ||
|
|
||
| if (_cfg_rel GREATER -1 OR _cfg_relwdeb GREATER -1 OR _cfg_minsizerel GREATER -1) | ||
| list(APPEND _boost_variants release) | ||
| endif() | ||
|
|
||
| if (MSVC AND ${DEP_DEBUG} ) | ||
| list(APPEND _boost_variants debug) | ||
| endif() | ||
|
|
||
| if (NOT _boost_variants) | ||
| set(_boost_variants release) | ||
| endif() | ||
|
|
||
| if (IS_CROSS_COMPILE AND APPLE) | ||
| if (${CMAKE_OSX_ARCHITECTURES} MATCHES "arm") | ||
| message(STATUS "Compiling Boost for arm64.") | ||
| message(STATUS "Compiling Boost with toolset ${_boost_toolset}.") | ||
| message(STATUS "Compiling Boost with libs ${_libs}.") | ||
| message(STATUS "Compiling Boost with variant ${_boost_variants}.") | ||
| message(STATUS "Compiling Boost with _bootstrap_cmd ${_bootstrap_cmd}.") | ||
| message(STATUS "_boost_linkflags = ${_boost_linkflags}") | ||
| set(_arch_flags "-arch arm64") | ||
| set(_boost_linkflags "linkflags=${_arch_flags}") | ||
| message(STATUS "_cmake_args_osx_arch = '${_cmake_args_osx_arch}'") | ||
| elseif (${CMAKE_OSX_ARCHITECTURES} MATCHES "x86_64") | ||
| message(STATUS "Compiling Boost for x86_64.") | ||
| set(_arch_flags "-arch x86_64") | ||
| endif() | ||
| set(_boost_linkflags "linkflags=${_arch_flags}") | ||
| set(_context_arch_line "-DBOOST_CONTEXT_ARCHITECTURE:STRING=${CMAKE_OSX_ARCHITECTURES}") | ||
| endif () | ||
|
|
||
| set(_boost_flags "") | ||
| if(APPLE) | ||
| set(_boost_flags | ||
| "cflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET};" | ||
| "cxxflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET};" | ||
| "mflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET};" | ||
| "mmflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET}") | ||
| elseif (UNIX) | ||
| set(_boost_flags "cflags=-fPIC;cxxflags=-fPIC") | ||
| endif() | ||
|
|
||
| set(_build_cmd ${_build_cmd} | ||
| ${_boost_flags} | ||
| ${_boost_linkflags} | ||
| -j${NPROC} | ||
| ${_libs} | ||
| --layout=versioned | ||
| --debug-configuration | ||
| toolset=${_boost_toolset} | ||
| address-model=${_bits} | ||
| link=${_link} | ||
| threading=multi | ||
| boost.locale.icu=off | ||
| --disable-icu | ||
| ${_boost_variants} | ||
| stage) | ||
|
|
||
| set(_install_cmd ${_build_cmd} --prefix=${_prefix} install) | ||
|
|
||
| if (NOT IS_CROSS_COMPILE OR NOT APPLE OR BUILD_SHARED_LIBS) | ||
| message(STATUS "Standard boost build with bootstrap command '${_bootstrap_cmd}'") | ||
| message(STATUS "Standard boost build with patch command '${_patch_command}'") | ||
| message(STATUS "Standard boost build with build command '${_build_cmd}'") | ||
| message(STATUS "Standard boost build with install command '${_install_cmd}'") | ||
| ExternalProject_Add( | ||
| dep_Boost | ||
| URL ${_boost_url} | ||
| URL_HASH SHA256=${_boost_hash} | ||
| DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/Boost | ||
| CONFIGURE_COMMAND "${_bootstrap_cmd}" | ||
| PATCH_COMMAND ${_patch_command} | ||
| BUILD_COMMAND "${_build_cmd}" | ||
| BUILD_IN_SOURCE ON | ||
| INSTALL_COMMAND "${_install_cmd}" | ||
| ) | ||
|
|
||
| else() | ||
|
|
||
| ExternalProject_Add( | ||
| dep_Boost | ||
| URL ${_boost_url} | ||
| URL_HASH SHA256=${_boost_hash} | ||
| DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/Boost | ||
| CONFIGURE_COMMAND ./bootstrap.sh | ||
| --with-toolset=clang | ||
| --with-libraries=date_time,filesystem,iostreams,locale,log,regex,system,thread | ||
| "--prefix=${DESTDIR}/usr/local" | ||
| # PATCH_COMMAND ${_patch_command} | ||
| BUILD_COMMAND "${_build_cmd}" | ||
| BUILD_IN_SOURCE ON | ||
| INSTALL_COMMAND "${_install_cmd}" | ||
| orcaslicer_add_cmake_project(Boost | ||
| URL "https://github.com/boostorg/boost/releases/download/boost-1.84.0/boost-1.84.0.tar.gz" | ||
| URL_HASH SHA256=4d27e9efed0f6f152dc28db6430b9d3dfb40c0345da7342eaa5a987dde57bd95 | ||
| LIST_SEPARATOR | | ||
| CMAKE_ARGS | ||
| -DBOOST_EXCLUDE_LIBRARIES:STRING=contract|fiber|numpy|stacktrace|wave|test | ||
| -DBOOST_LOCALE_ENABLE_ICU:BOOL=OFF # do not link to libicu, breaks compatibility between distros | ||
| -DBUILD_TESTING:BOOL=OFF | ||
| "${_context_abi_line}" | ||
| "${_context_arch_line}" | ||
| ) | ||
| endif() | ||
|
|
||
| if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8") | ||
| message(STATUS "Patch the boost::polygon library with a custom one.") | ||
| # Patch the boost::polygon library with a custom one. | ||
| ExternalProject_Add(dep_boost_polygon | ||
| EXCLUDE_FROM_ALL ON | ||
| # GIT_REPOSITORY "https://github.com/prusa3d/polygon" | ||
| # GIT_TAG prusaslicer_gmp | ||
| URL https://github.com/prusa3d/polygon/archive/refs/heads/prusaslicer_gmp.zip | ||
| URL_HASH SHA256=abeb9710f0a7069fb9b22181ae5c56f6066002f125db210e7ffb27032aed6824 | ||
| DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/boost_polygon | ||
| DEPENDS dep_Boost | ||
| CONFIGURE_COMMAND "" | ||
| BUILD_COMMAND "" | ||
| ${_cmake_args_osx_arch} | ||
| INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory | ||
| "${CMAKE_CURRENT_BINARY_DIR}/dep_boost_polygon-prefix/src/dep_boost_polygon/include/boost/polygon" | ||
| "${DESTDIR}/usr/local/include/boost/polygon" | ||
| ) | ||
| # Only override boost::Polygon Voronoi implementation with Vojtech's GMP hacks on 64bit platforms. | ||
| list(APPEND _dep_list "dep_boost_polygon") | ||
| endif () | ||
| set(DEP_Boost_DEPENDS ZLIB) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.