From b93112c67431d2cb962f2b6b7ad21fb13989119e Mon Sep 17 00:00:00 2001 From: Ian Bassi Date: Sun, 28 Dec 2025 06:19:02 -0300 Subject: [PATCH] Move Clipper2 dependency to deps_src directory (#11736) Relocated Clipper2 source files and CMake configuration from src/clipper2 to deps_src/clipper2. Updated CMakeLists to add Clipper2 as a dependency from the new location, improving dependency organization. Co-authored-by: Rodrigo Faselli <162915171+RF47@users.noreply.github.com> --- deps_src/CMakeLists.txt | 1 + {src => deps_src}/clipper2/CMakeLists.txt | 0 .../clipper2/Clipper2Lib/include/clipper2/clipper.core.h | 0 .../clipper2/Clipper2Lib/include/clipper2/clipper.engine.h | 0 .../clipper2/Clipper2Lib/include/clipper2/clipper.export.h | 0 .../clipper2/Clipper2Lib/include/clipper2/clipper.h | 0 .../clipper2/Clipper2Lib/include/clipper2/clipper.minkowski.h | 0 .../clipper2/Clipper2Lib/include/clipper2/clipper.offset.h | 0 .../clipper2/Clipper2Lib/include/clipper2/clipper.rectclip.h | 0 .../clipper2/Clipper2Lib/include/clipper2/clipper.version.h | 0 .../clipper2/Clipper2Lib/include/clipper2/clipper2_z.hpp | 0 {src => deps_src}/clipper2/Clipper2Lib/src/clipper.engine.cpp | 0 {src => deps_src}/clipper2/Clipper2Lib/src/clipper.offset.cpp | 0 {src => deps_src}/clipper2/Clipper2Lib/src/clipper.rectclip.cpp | 0 {src => deps_src}/clipper2/Clipper2Lib/src/clipper2_z.cpp | 0 src/CMakeLists.txt | 2 -- 16 files changed, 1 insertion(+), 2 deletions(-) rename {src => deps_src}/clipper2/CMakeLists.txt (100%) rename {src => deps_src}/clipper2/Clipper2Lib/include/clipper2/clipper.core.h (100%) rename {src => deps_src}/clipper2/Clipper2Lib/include/clipper2/clipper.engine.h (100%) rename {src => deps_src}/clipper2/Clipper2Lib/include/clipper2/clipper.export.h (100%) rename {src => deps_src}/clipper2/Clipper2Lib/include/clipper2/clipper.h (100%) rename {src => deps_src}/clipper2/Clipper2Lib/include/clipper2/clipper.minkowski.h (100%) rename {src => deps_src}/clipper2/Clipper2Lib/include/clipper2/clipper.offset.h (100%) rename {src => deps_src}/clipper2/Clipper2Lib/include/clipper2/clipper.rectclip.h (100%) rename {src => deps_src}/clipper2/Clipper2Lib/include/clipper2/clipper.version.h (100%) rename {src => deps_src}/clipper2/Clipper2Lib/include/clipper2/clipper2_z.hpp (100%) rename {src => deps_src}/clipper2/Clipper2Lib/src/clipper.engine.cpp (100%) rename {src => deps_src}/clipper2/Clipper2Lib/src/clipper.offset.cpp (100%) rename {src => deps_src}/clipper2/Clipper2Lib/src/clipper.rectclip.cpp (100%) rename {src => deps_src}/clipper2/Clipper2Lib/src/clipper2_z.cpp (100%) diff --git a/deps_src/CMakeLists.txt b/deps_src/CMakeLists.txt index 5c4e62b99f..11457c0d18 100644 --- a/deps_src/CMakeLists.txt +++ b/deps_src/CMakeLists.txt @@ -17,6 +17,7 @@ add_subdirectory(stb_dxt) # Header-only STB DXT compression library add_subdirectory(Shiny) add_subdirectory(admesh) add_subdirectory(clipper) +add_subdirectory(clipper2) add_subdirectory(expat) add_subdirectory(glu-libtess) add_subdirectory(hidapi) diff --git a/src/clipper2/CMakeLists.txt b/deps_src/clipper2/CMakeLists.txt similarity index 100% rename from src/clipper2/CMakeLists.txt rename to deps_src/clipper2/CMakeLists.txt diff --git a/src/clipper2/Clipper2Lib/include/clipper2/clipper.core.h b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.core.h similarity index 100% rename from src/clipper2/Clipper2Lib/include/clipper2/clipper.core.h rename to deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.core.h diff --git a/src/clipper2/Clipper2Lib/include/clipper2/clipper.engine.h b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.engine.h similarity index 100% rename from src/clipper2/Clipper2Lib/include/clipper2/clipper.engine.h rename to deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.engine.h diff --git a/src/clipper2/Clipper2Lib/include/clipper2/clipper.export.h b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.export.h similarity index 100% rename from src/clipper2/Clipper2Lib/include/clipper2/clipper.export.h rename to deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.export.h diff --git a/src/clipper2/Clipper2Lib/include/clipper2/clipper.h b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.h similarity index 100% rename from src/clipper2/Clipper2Lib/include/clipper2/clipper.h rename to deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.h diff --git a/src/clipper2/Clipper2Lib/include/clipper2/clipper.minkowski.h b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.minkowski.h similarity index 100% rename from src/clipper2/Clipper2Lib/include/clipper2/clipper.minkowski.h rename to deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.minkowski.h diff --git a/src/clipper2/Clipper2Lib/include/clipper2/clipper.offset.h b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.offset.h similarity index 100% rename from src/clipper2/Clipper2Lib/include/clipper2/clipper.offset.h rename to deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.offset.h diff --git a/src/clipper2/Clipper2Lib/include/clipper2/clipper.rectclip.h b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.rectclip.h similarity index 100% rename from src/clipper2/Clipper2Lib/include/clipper2/clipper.rectclip.h rename to deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.rectclip.h diff --git a/src/clipper2/Clipper2Lib/include/clipper2/clipper.version.h b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.version.h similarity index 100% rename from src/clipper2/Clipper2Lib/include/clipper2/clipper.version.h rename to deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.version.h diff --git a/src/clipper2/Clipper2Lib/include/clipper2/clipper2_z.hpp b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper2_z.hpp similarity index 100% rename from src/clipper2/Clipper2Lib/include/clipper2/clipper2_z.hpp rename to deps_src/clipper2/Clipper2Lib/include/clipper2/clipper2_z.hpp diff --git a/src/clipper2/Clipper2Lib/src/clipper.engine.cpp b/deps_src/clipper2/Clipper2Lib/src/clipper.engine.cpp similarity index 100% rename from src/clipper2/Clipper2Lib/src/clipper.engine.cpp rename to deps_src/clipper2/Clipper2Lib/src/clipper.engine.cpp diff --git a/src/clipper2/Clipper2Lib/src/clipper.offset.cpp b/deps_src/clipper2/Clipper2Lib/src/clipper.offset.cpp similarity index 100% rename from src/clipper2/Clipper2Lib/src/clipper.offset.cpp rename to deps_src/clipper2/Clipper2Lib/src/clipper.offset.cpp diff --git a/src/clipper2/Clipper2Lib/src/clipper.rectclip.cpp b/deps_src/clipper2/Clipper2Lib/src/clipper.rectclip.cpp similarity index 100% rename from src/clipper2/Clipper2Lib/src/clipper.rectclip.cpp rename to deps_src/clipper2/Clipper2Lib/src/clipper.rectclip.cpp diff --git a/src/clipper2/Clipper2Lib/src/clipper2_z.cpp b/deps_src/clipper2/Clipper2Lib/src/clipper2_z.cpp similarity index 100% rename from src/clipper2/Clipper2Lib/src/clipper2_z.cpp rename to deps_src/clipper2/Clipper2Lib/src/clipper2_z.cpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ea7731bf30..8e9a31f705 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,8 +6,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) # Include dev-utils for encoding check and other utilities add_subdirectory(dev-utils) -# Clipper2 math utils -add_subdirectory(clipper2) # add_subdirectory(avrdude) # Note: semver and hints are now included from deps_src/CMakeLists.txt