From 75bddaba508f7db19df532506d8118481f4232a6 Mon Sep 17 00:00:00 2001 From: Sergey Mende Date: Sat, 1 Oct 2022 10:19:28 +0300 Subject: [PATCH] Move files as per #243 discussion --- CPP/CMakeLists.txt | 18 +++++++++--------- .../{ => include/clipper2}/clipper.core.h | 0 .../{ => include/clipper2}/clipper.engine.h | 0 .../{ => include/clipper2}/clipper.h | 0 .../{ => include/clipper2}/clipper.minkowski.h | 0 .../{ => include/clipper2}/clipper.offset.h | 0 CPP/Clipper2Lib/{ => src}/clipper.engine.cpp | 2 +- CPP/Clipper2Lib/{ => src}/clipper.offset.cpp | 4 ++-- CPP/Tests/TestLines.cpp | 2 +- CPP/Tests/TestOffsetOrientation.cpp | 2 +- CPP/Tests/TestOrientation.cpp | 2 +- CPP/Tests/TestPolygons.cpp | 2 +- CPP/Tests/TestPolytreeHoles1.cpp | 2 +- CPP/Tests/TestPolytreeHoles2.cpp | 2 +- CPP/Tests/TestPolytreeIntersection.cpp | 2 +- CPP/Tests/TestPolytreeUnion.cpp | 2 +- CPP/Tests/TestRandomPaths.cpp | 2 +- CPP/Tests/TestTrimCollinear.cpp | 2 +- CPP/Utils/ClipFileLoad.h | 2 +- CPP/Utils/ClipFileSave.h | 2 +- CPP/Utils/clipper.svg.h | 2 +- CPP/Utils/clipper.svg.utils.h | 2 +- 22 files changed, 26 insertions(+), 26 deletions(-) rename CPP/Clipper2Lib/{ => include/clipper2}/clipper.core.h (100%) rename CPP/Clipper2Lib/{ => include/clipper2}/clipper.engine.h (100%) rename CPP/Clipper2Lib/{ => include/clipper2}/clipper.h (100%) rename CPP/Clipper2Lib/{ => include/clipper2}/clipper.minkowski.h (100%) rename CPP/Clipper2Lib/{ => include/clipper2}/clipper.offset.h (100%) rename CPP/Clipper2Lib/{ => src}/clipper.engine.cpp (99%) rename CPP/Clipper2Lib/{ => src}/clipper.offset.cpp (99%) diff --git a/CPP/CMakeLists.txt b/CPP/CMakeLists.txt index 7c6da774..53d6cc3b 100644 --- a/CPP/CMakeLists.txt +++ b/CPP/CMakeLists.txt @@ -15,23 +15,23 @@ option(BUILD_SHARED_LIBS "Build shared libs" OFF) include(GNUInstallDirs) set(CLIPPER2_INC - Clipper2Lib/clipper.core.h - Clipper2Lib/clipper.engine.h - Clipper2Lib/clipper.h - Clipper2Lib/clipper.minkowski.h - Clipper2Lib/clipper.offset.h + Clipper2Lib/include/clipper2/clipper.core.h + Clipper2Lib/include/clipper2/clipper.engine.h + Clipper2Lib/include/clipper2/clipper.h + Clipper2Lib/include/clipper2/clipper.minkowski.h + Clipper2Lib/include/clipper2/clipper.offset.h ) set(CLIPPER2_SRC - Clipper2Lib/clipper.engine.cpp - Clipper2Lib/clipper.offset.cpp + Clipper2Lib/src/clipper.engine.cpp + Clipper2Lib/src/clipper.offset.cpp ) # 2d version of Clipper2 add_library(Clipper2 ${CLIPPER2_INC} ${CLIPPER2_SRC}) target_include_directories(Clipper2 - PUBLIC Clipper2Lib + PUBLIC Clipper2Lib/include ) # Clipper2 but with USINGZ defined @@ -40,7 +40,7 @@ add_library(Clipper2Z ${CLIPPER2_INC} ${CLIPPER2_SRC}) target_compile_definitions(Clipper2Z PUBLIC USINGZ) target_include_directories(Clipper2Z - PUBLIC Clipper2Lib + PUBLIC Clipper2Lib/include ) if (WIN32) diff --git a/CPP/Clipper2Lib/clipper.core.h b/CPP/Clipper2Lib/include/clipper2/clipper.core.h similarity index 100% rename from CPP/Clipper2Lib/clipper.core.h rename to CPP/Clipper2Lib/include/clipper2/clipper.core.h diff --git a/CPP/Clipper2Lib/clipper.engine.h b/CPP/Clipper2Lib/include/clipper2/clipper.engine.h similarity index 100% rename from CPP/Clipper2Lib/clipper.engine.h rename to CPP/Clipper2Lib/include/clipper2/clipper.engine.h diff --git a/CPP/Clipper2Lib/clipper.h b/CPP/Clipper2Lib/include/clipper2/clipper.h similarity index 100% rename from CPP/Clipper2Lib/clipper.h rename to CPP/Clipper2Lib/include/clipper2/clipper.h diff --git a/CPP/Clipper2Lib/clipper.minkowski.h b/CPP/Clipper2Lib/include/clipper2/clipper.minkowski.h similarity index 100% rename from CPP/Clipper2Lib/clipper.minkowski.h rename to CPP/Clipper2Lib/include/clipper2/clipper.minkowski.h diff --git a/CPP/Clipper2Lib/clipper.offset.h b/CPP/Clipper2Lib/include/clipper2/clipper.offset.h similarity index 100% rename from CPP/Clipper2Lib/clipper.offset.h rename to CPP/Clipper2Lib/include/clipper2/clipper.offset.h diff --git a/CPP/Clipper2Lib/clipper.engine.cpp b/CPP/Clipper2Lib/src/clipper.engine.cpp similarity index 99% rename from CPP/Clipper2Lib/clipper.engine.cpp rename to CPP/Clipper2Lib/src/clipper.engine.cpp index 4b84ad92..497da173 100644 --- a/CPP/Clipper2Lib/clipper.engine.cpp +++ b/CPP/Clipper2Lib/src/clipper.engine.cpp @@ -14,7 +14,7 @@ #include #include #include -#include "clipper.engine.h" +#include "clipper2/clipper.engine.h" namespace Clipper2Lib { diff --git a/CPP/Clipper2Lib/clipper.offset.cpp b/CPP/Clipper2Lib/src/clipper.offset.cpp similarity index 99% rename from CPP/Clipper2Lib/clipper.offset.cpp rename to CPP/Clipper2Lib/src/clipper.offset.cpp index 67641bd6..71590d2c 100644 --- a/CPP/Clipper2Lib/clipper.offset.cpp +++ b/CPP/Clipper2Lib/src/clipper.offset.cpp @@ -9,8 +9,8 @@ *******************************************************************************/ #include -#include "clipper.h" -#include "clipper.offset.h" +#include "clipper2/clipper.h" +#include "clipper2/clipper.offset.h" namespace Clipper2Lib { diff --git a/CPP/Tests/TestLines.cpp b/CPP/Tests/TestLines.cpp index 8a7bad0e..1122a425 100644 --- a/CPP/Tests/TestLines.cpp +++ b/CPP/Tests/TestLines.cpp @@ -1,5 +1,5 @@ #include -#include "clipper.h" +#include "clipper2/clipper.h" #include "ClipFileLoad.h" TEST(Clipper2Tests, TestMultipleLines) { diff --git a/CPP/Tests/TestOffsetOrientation.cpp b/CPP/Tests/TestOffsetOrientation.cpp index 50153675..5cd68d12 100644 --- a/CPP/Tests/TestOffsetOrientation.cpp +++ b/CPP/Tests/TestOffsetOrientation.cpp @@ -1,5 +1,5 @@ #include -#include "clipper.offset.h" +#include "clipper2/clipper.offset.h" TEST(Clipper2Tests, TestOffsettingOrientation) { Clipper2Lib::ClipperOffset co; diff --git a/CPP/Tests/TestOrientation.cpp b/CPP/Tests/TestOrientation.cpp index 07515c36..aff09bd3 100644 --- a/CPP/Tests/TestOrientation.cpp +++ b/CPP/Tests/TestOrientation.cpp @@ -1,5 +1,5 @@ #include -#include "clipper.h" +#include "clipper2/clipper.h" using namespace Clipper2Lib; diff --git a/CPP/Tests/TestPolygons.cpp b/CPP/Tests/TestPolygons.cpp index 1b2b67f9..c3dadca9 100644 --- a/CPP/Tests/TestPolygons.cpp +++ b/CPP/Tests/TestPolygons.cpp @@ -1,5 +1,5 @@ #include -#include "clipper.h" +#include "clipper2/clipper.h" #include "ClipFileLoad.h" inline Clipper2Lib::PathD MakeRandomPath(int width, int height, unsigned vertCnt) diff --git a/CPP/Tests/TestPolytreeHoles1.cpp b/CPP/Tests/TestPolytreeHoles1.cpp index 74690ae6..176ef063 100644 --- a/CPP/Tests/TestPolytreeHoles1.cpp +++ b/CPP/Tests/TestPolytreeHoles1.cpp @@ -1,5 +1,5 @@ #include -#include "clipper.h" +#include "clipper2/clipper.h" #include "ClipFileLoad.h" using namespace Clipper2Lib; diff --git a/CPP/Tests/TestPolytreeHoles2.cpp b/CPP/Tests/TestPolytreeHoles2.cpp index 2207d96e..18e3707d 100644 --- a/CPP/Tests/TestPolytreeHoles2.cpp +++ b/CPP/Tests/TestPolytreeHoles2.cpp @@ -1,5 +1,5 @@ #include -#include "clipper.h" +#include "clipper2/clipper.h" #include "ClipFileLoad.h" using namespace Clipper2Lib; diff --git a/CPP/Tests/TestPolytreeIntersection.cpp b/CPP/Tests/TestPolytreeIntersection.cpp index d86ace03..5b2e5fd3 100644 --- a/CPP/Tests/TestPolytreeIntersection.cpp +++ b/CPP/Tests/TestPolytreeIntersection.cpp @@ -1,5 +1,5 @@ #include -#include "clipper.h" +#include "clipper2/clipper.h" using namespace Clipper2Lib; diff --git a/CPP/Tests/TestPolytreeUnion.cpp b/CPP/Tests/TestPolytreeUnion.cpp index 09dedbbf..b8ebcd3a 100644 --- a/CPP/Tests/TestPolytreeUnion.cpp +++ b/CPP/Tests/TestPolytreeUnion.cpp @@ -1,5 +1,5 @@ #include -#include "clipper.h" +#include "clipper2/clipper.h" using namespace Clipper2Lib; diff --git a/CPP/Tests/TestRandomPaths.cpp b/CPP/Tests/TestRandomPaths.cpp index 4f62243f..36d164e7 100644 --- a/CPP/Tests/TestRandomPaths.cpp +++ b/CPP/Tests/TestRandomPaths.cpp @@ -1,5 +1,5 @@ #include -#include "clipper.h" +#include "clipper2/clipper.h" #include #include diff --git a/CPP/Tests/TestTrimCollinear.cpp b/CPP/Tests/TestTrimCollinear.cpp index c3fa1215..b0b82384 100644 --- a/CPP/Tests/TestTrimCollinear.cpp +++ b/CPP/Tests/TestTrimCollinear.cpp @@ -1,5 +1,5 @@ #include -#include "clipper.h" +#include "clipper2/clipper.h" using namespace Clipper2Lib; diff --git a/CPP/Utils/ClipFileLoad.h b/CPP/Utils/ClipFileLoad.h index 2c40946a..081f7c04 100644 --- a/CPP/Utils/ClipFileLoad.h +++ b/CPP/Utils/ClipFileLoad.h @@ -7,7 +7,7 @@ #include #include -#include "clipper.h" +#include "clipper2/clipper.h" #ifndef _WIN32 #include #include diff --git a/CPP/Utils/ClipFileSave.h b/CPP/Utils/ClipFileSave.h index acae22d9..9aa253ae 100644 --- a/CPP/Utils/ClipFileSave.h +++ b/CPP/Utils/ClipFileSave.h @@ -5,7 +5,7 @@ #ifndef CLIPPER_TEST_SAVE_H #define CLIPPER_TEST_SAVE_H -#include "clipper.h" +#include "clipper2/clipper.h" bool SaveTest(const std::string& filename, bool append, Clipper2Lib::Paths64* subj, Clipper2Lib::Paths64* subj_open, Clipper2Lib::Paths64* clip, diff --git a/CPP/Utils/clipper.svg.h b/CPP/Utils/clipper.svg.h index 891a739e..fc8b0c0b 100644 --- a/CPP/Utils/clipper.svg.h +++ b/CPP/Utils/clipper.svg.h @@ -11,7 +11,7 @@ #include #include -#include "clipper.h" +#include "clipper2/clipper.h" namespace Clipper2Lib { diff --git a/CPP/Utils/clipper.svg.utils.h b/CPP/Utils/clipper.svg.utils.h index 6d6f6a1a..3831c58b 100644 --- a/CPP/Utils/clipper.svg.utils.h +++ b/CPP/Utils/clipper.svg.utils.h @@ -11,7 +11,7 @@ #include #include -#include "clipper.h" +#include "clipper2/clipper.h" #include "clipper.svg.h" #ifndef _WIN32 #include