Merge remote-tracking branch 'remote/main' into dev/h2d

# Conflicts: # src/libslic3r/CMakeLists.txt # src/slic3r/CMakeLists.txt
2026-05-17 02:22:17 +00:00 · 2025-09-20 13:10:10 +08:00
parent bc9e0066e7 7aa3ce8a4d
commit c26266dfb6
44 changed files with 1020 additions and 948 deletions
--- a/deps_src/CMakeLists.txt
+++ b/deps_src/CMakeLists.txt
@@ -32,4 +32,4 @@ add_subdirectory(qoi)
 add_subdirectory(semver)      # Semver static library

 # Eigen header-only library
-add_subdirectory(eigen)
+add_subdirectory(eigen)
--- a/deps_src/Shiny/CMakeLists.txt
+++ b/deps_src/Shiny/CMakeLists.txt
@@ -24,6 +24,7 @@ add_library(Shiny STATIC
    ShinyZone.h
 )

-target_include_directories(Shiny PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}
+target_include_directories(Shiny SYSTEM
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
 )
--- a/deps_src/admesh/CMakeLists.txt
+++ b/deps_src/admesh/CMakeLists.txt
@@ -11,9 +11,10 @@ add_library(admesh STATIC
    util.cpp
 )

-target_include_directories(admesh PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/..
+target_include_directories(admesh SYSTEM
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR}/..
 )

 target_link_libraries(admesh 
--- a/deps_src/agg/CMakeLists.txt
+++ b/deps_src/agg/CMakeLists.txt
@@ -3,8 +3,9 @@ project(agg)

 add_library(agg INTERFACE)

-target_include_directories(agg INTERFACE
-    ${CMAKE_CURRENT_SOURCE_DIR}
+target_include_directories(agg SYSTEM
+    INTERFACE
+        ${CMAKE_CURRENT_SOURCE_DIR}
 )

 target_sources(agg INTERFACE
@@ -32,4 +33,4 @@ target_sources(agg INTERFACE
    ${CMAKE_CURRENT_SOURCE_DIR}/agg_rendering_buffer.h
    ${CMAKE_CURRENT_SOURCE_DIR}/agg_scanline_p.h
    ${CMAKE_CURRENT_SOURCE_DIR}/agg_trans_affine.h
-)
+)
--- a/deps_src/ankerl/CMakeLists.txt
+++ b/deps_src/ankerl/CMakeLists.txt
@@ -3,10 +3,11 @@ project(ankerl)

 add_library(ankerl INTERFACE)

-target_include_directories(ankerl INTERFACE
-    ${CMAKE_CURRENT_SOURCE_DIR}
+target_include_directories(ankerl SYSTEM
+    INTERFACE
+        ${CMAKE_CURRENT_SOURCE_DIR}
 )

 target_sources(ankerl INTERFACE
    ${CMAKE_CURRENT_SOURCE_DIR}/unordered_dense.h
-)
+)
--- a/deps_src/clipper/CMakeLists.txt
+++ b/deps_src/clipper/CMakeLists.txt
@@ -9,8 +9,9 @@ add_library(clipper STATIC
    clipper_z.hpp
 )

-target_include_directories(clipper PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}
+target_include_directories(clipper SYSTEM
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
 )

 target_link_libraries(clipper 
--- a/deps_src/eigen/CMakeLists.txt
+++ b/deps_src/eigen/CMakeLists.txt
@@ -3,9 +3,10 @@ project(eigen)

 add_library(eigen INTERFACE)

-target_include_directories(eigen INTERFACE
-    ${CMAKE_CURRENT_SOURCE_DIR}
+target_include_directories(eigen SYSTEM
+    INTERFACE
+        ${CMAKE_CURRENT_SOURCE_DIR}
 )

 # Eigen is header-only, so we only need to specify the include directory
-# The headers are in the Eigen/ subdirectory structure
+# The headers are in the Eigen/ subdirectory structure
--- a/deps_src/expat/CMakeLists.txt
+++ b/deps_src/expat/CMakeLists.txt
@@ -7,8 +7,9 @@ add_library(expat STATIC
    xmltok.c
 )

-target_include_directories(expat PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}
+target_include_directories(expat SYSTEM
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
 )

 target_sources(expat PRIVATE
@@ -33,4 +34,4 @@ endif()

 if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
    target_compile_options(expat PRIVATE -Wno-unused-parameter)
-endif()
+endif()
--- a/deps_src/fast_float/CMakeLists.txt
+++ b/deps_src/fast_float/CMakeLists.txt
@@ -3,8 +3,9 @@ project(fast_float)

 add_library(fast_float INTERFACE)

-target_include_directories(fast_float INTERFACE
-    ${CMAKE_CURRENT_SOURCE_DIR}
+target_include_directories(fast_float SYSTEM
+    INTERFACE
+        ${CMAKE_CURRENT_SOURCE_DIR}
 )

 target_sources(fast_float INTERFACE
@@ -12,4 +13,4 @@ target_sources(fast_float INTERFACE
 )

 # Require C++14 for fast_float
-target_compile_features(fast_float INTERFACE cxx_std_14)
+target_compile_features(fast_float INTERFACE cxx_std_14)
--- a/deps_src/glu-libtess/CMakeLists.txt
+++ b/deps_src/glu-libtess/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13)

 project(glu-libtess)

-add_library(glu-libtess STATIC 
+add_library(glu-libtess STATIC
 	src/dict-list.h
 	src/dict.c
 	src/dict.h
@@ -34,4 +34,8 @@ if(UNIX)
    target_link_libraries(glu-libtess m)
 endif(UNIX)

-target_include_directories(glu-libtess PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
+target_include_directories(glu-libtess SYSTEM
+    PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}/include)
--- a/deps_src/hidapi/CMakeLists.txt
+++ b/deps_src/hidapi/CMakeLists.txt
@@ -11,7 +11,12 @@ endif()
 include_directories(include)

 add_library(hidapi STATIC ${HIDAPI_IMPL})
-target_include_directories(hidapi PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
+target_include_directories(hidapi SYSTEM
+    PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}/include
+    )

 if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
 	# Don't link the udev library, as there are two versions out there (libudev.so.0, libudev.so.1), so they are linked explicitely.
--- a/deps_src/hints/CMakeLists.txt
+++ b/deps_src/hints/CMakeLists.txt
@@ -11,8 +11,8 @@ add_executable(hintsToPot
    HintsToPot.cpp)

 # Set include directories for the executable
-target_include_directories(hintsToPot 
-    PRIVATE 
+target_include_directories(hintsToPot SYSTEM
+    PRIVATE
        ${CMAKE_CURRENT_SOURCE_DIR}
 )

@@ -25,7 +25,7 @@ endif()
 add_library(hints INTERFACE)

 # Set include directories for the interface library
-target_include_directories(hints 
+target_include_directories(hints SYSTEM
    INTERFACE 
        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
        $<INSTALL_INTERFACE:include>
--- a/deps_src/imgui/CMakeLists.txt
+++ b/deps_src/imgui/CMakeLists.txt
@@ -19,8 +19,9 @@ add_library(imgui STATIC
    imstb_truetype.h
 )

-target_include_directories(imgui PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}
+target_include_directories(imgui SYSTEM
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
 )

 if(Boost_FOUND)
--- a/deps_src/imguizmo/CMakeLists.txt
+++ b/deps_src/imguizmo/CMakeLists.txt
@@ -7,9 +7,11 @@ add_library(imguizmo STATIC
    ImGuizmo.cpp
 )

-target_include_directories(imguizmo 
-    PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
-    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..
+target_include_directories(imguizmo SYSTEM
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
+    PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}/..
 )

 target_link_libraries(imguizmo PUBLIC imgui)
--- a/deps_src/libigl/CMakeLists.txt
+++ b/deps_src/libigl/CMakeLists.txt
@@ -11,5 +11,7 @@ if(libigl_FOUND)
    target_link_libraries(libigl INTERFACE igl::core)
 else()
    message(STATUS "IGL NOT found, using bundled version...")
-    target_include_directories(libigl SYSTEM BEFORE INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+    target_include_directories(libigl SYSTEM BEFORE
+        INTERFACE
+            ${CMAKE_CURRENT_SOURCE_DIR})
 endif()
--- a/deps_src/libnest2d/CMakeLists.txt
+++ b/deps_src/libnest2d/CMakeLists.txt
@@ -23,6 +23,6 @@ set(LIBNEST2D_SRCFILES

 add_library(libnest2d STATIC ${LIBNEST2D_SRCFILES})

-target_include_directories(libnest2d PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include)
+target_include_directories(libnest2d SYSTEM PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include)
 target_link_libraries(libnest2d PUBLIC NLopt::nlopt TBB::tbb Boost::boost libslic3r)
 target_compile_definitions(libnest2d PUBLIC LIBNEST2D_THREADING_tbb LIBNEST2D_STATIC LIBNEST2D_OPTIMIZER_nlopt LIBNEST2D_GEOMETRIES_libslic3r)
--- a/deps_src/mcut/CMakeLists.txt
+++ b/deps_src/mcut/CMakeLists.txt
@@ -176,7 +176,7 @@ function(create_library_target LIBRARY_TYPE)
 	
 	add_library(${target_name} ${LIBRARY_TYPE} ${project_source_files})

-	target_include_directories(${target_name} PRIVATE ${include_dirs})
+        target_include_directories(${target_name} SYSTEM PRIVATE ${include_dirs})
 	target_link_libraries(${target_name} PRIVATE ${extra_libs})
 	target_compile_options(${target_name} PRIVATE ${compilation_flags})
 	target_compile_definitions(${target_name} PRIVATE ${preprocessor_defs} )
@@ -414,4 +414,4 @@ endif ()

 # include(CPack)

-# eof
+# eof
--- a/deps_src/minilzo/CMakeLists.txt
+++ b/deps_src/minilzo/CMakeLists.txt
@@ -16,7 +16,7 @@ if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU")
 endif()

 target_link_libraries(minilzo INTERFACE minilzo_static)
-target_include_directories(minilzo INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(minilzo SYSTEM INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})

 message(STATUS "Minilzo using bundled version...")

--- a/deps_src/miniz/CMakeLists.txt
+++ b/deps_src/miniz/CMakeLists.txt
@@ -14,5 +14,5 @@ if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU")
 endif()

 target_link_libraries(miniz INTERFACE miniz_static)
-target_include_directories(miniz INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(miniz SYSTEM INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})

--- a/deps_src/nanosvg/CMakeLists.txt
+++ b/deps_src/nanosvg/CMakeLists.txt
@@ -4,11 +4,12 @@ project(nanosvg)

 add_library(nanosvg INTERFACE)

-target_include_directories(nanosvg INTERFACE
-    ${CMAKE_CURRENT_SOURCE_DIR}
+target_include_directories(nanosvg SYSTEM
+    INTERFACE
+        ${CMAKE_CURRENT_SOURCE_DIR}
 )

 target_sources(nanosvg INTERFACE
    ${CMAKE_CURRENT_SOURCE_DIR}/nanosvg.h
    ${CMAKE_CURRENT_SOURCE_DIR}/nanosvgrast.h
-)
+)
--- a/deps_src/nlohmann/CMakeLists.txt
+++ b/deps_src/nlohmann/CMakeLists.txt
@@ -4,8 +4,9 @@ project(nlohmann_json)

 add_library(nlohmann_json INTERFACE)

-target_include_directories(nlohmann_json INTERFACE
-    ${CMAKE_CURRENT_SOURCE_DIR}
+target_include_directories(nlohmann_json SYSTEM
+    INTERFACE
+        ${CMAKE_CURRENT_SOURCE_DIR}
 )

 target_sources(nlohmann_json INTERFACE
@@ -17,4 +18,4 @@ target_sources(nlohmann_json INTERFACE
 )

 # Require C++11 for nlohmann/json
-target_compile_features(nlohmann_json INTERFACE cxx_std_11)
+target_compile_features(nlohmann_json INTERFACE cxx_std_11)
--- a/deps_src/semver/CMakeLists.txt
+++ b/deps_src/semver/CMakeLists.txt
@@ -8,7 +8,7 @@ add_library(semver STATIC
 )

 # Set include directories for the library
-target_include_directories(semver 
+target_include_directories(semver SYSTEM
    PUBLIC 
        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
        $<INSTALL_INTERFACE:include>
--- a/deps_src/spline/CMakeLists.txt
+++ b/deps_src/spline/CMakeLists.txt
@@ -5,7 +5,7 @@ project(spline)
 add_library(spline INTERFACE)

 # Set include directories for the interface library
-target_include_directories(spline 
+target_include_directories(spline SYSTEM
    INTERFACE 
        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
        $<INSTALL_INTERFACE:include>
@@ -34,4 +34,4 @@ install(EXPORT splineTargets
    FILE splineTargets.cmake
    NAMESPACE spline::
    DESTINATION lib/cmake/spline
-)
+)
--- a/deps_src/stb_dxt/CMakeLists.txt
+++ b/deps_src/stb_dxt/CMakeLists.txt
@@ -5,7 +5,7 @@ project(stb_dxt)
 add_library(stb_dxt INTERFACE)

 # Set include directories for the interface library
-target_include_directories(stb_dxt 
+target_include_directories(stb_dxt SYSTEM
    INTERFACE 
        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
        $<INSTALL_INTERFACE:include>
@@ -34,4 +34,4 @@ install(EXPORT stb_dxtTargets
    FILE stb_dxtTargets.cmake
    NAMESPACE stb_dxt::
    DESTINATION lib/cmake/stb_dxt
-)
+)