Move files as per AngusJohnson#243 discussion

sergey-239 · Oct 1, 2022 · 75bddab · 75bddab
1 parent b520a63
commit 75bddab
Show file tree

Hide file tree

Showing 22 changed files with 26 additions and 26 deletions.
diff --git 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 → ...ipper2Lib/include/clipper2/clipper.core.h b/CPP/Clipper2Lib/clipper.core.h → ...ipper2Lib/include/clipper2/clipper.core.h
diff --git a/CPP/Clipper2Lib/clipper.engine.h → ...per2Lib/include/clipper2/clipper.engine.h b/CPP/Clipper2Lib/clipper.engine.h → ...per2Lib/include/clipper2/clipper.engine.h
diff --git a/CPP/Clipper2Lib/clipper.h → CPP/Clipper2Lib/include/clipper2/clipper.h b/CPP/Clipper2Lib/clipper.h → CPP/Clipper2Lib/include/clipper2/clipper.h
diff --git a/CPP/Clipper2Lib/clipper.minkowski.h → ...2Lib/include/clipper2/clipper.minkowski.h b/CPP/Clipper2Lib/clipper.minkowski.h → ...2Lib/include/clipper2/clipper.minkowski.h
diff --git a/CPP/Clipper2Lib/clipper.offset.h → ...per2Lib/include/clipper2/clipper.offset.h b/CPP/Clipper2Lib/clipper.offset.h → ...per2Lib/include/clipper2/clipper.offset.h
diff --git a/CPP/Clipper2Lib/clipper.engine.cpp → CPP/Clipper2Lib/src/clipper.engine.cpp b/CPP/Clipper2Lib/clipper.engine.cpp → CPP/Clipper2Lib/src/clipper.engine.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <numeric>
 #include <algorithm>
-#include "clipper.engine.h"
+#include "clipper2/clipper.engine.h"
 
 namespace Clipper2Lib {
 

diff --git a/CPP/Clipper2Lib/clipper.offset.cpp → CPP/Clipper2Lib/src/clipper.offset.cpp b/CPP/Clipper2Lib/clipper.offset.cpp → CPP/Clipper2Lib/src/clipper.offset.cpp
@@ -9,8 +9,8 @@
 *******************************************************************************/
 
 #include <cmath>
-#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
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#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
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#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
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "clipper.h"
+#include "clipper2/clipper.h"
 
 using namespace Clipper2Lib;
 

diff --git a/CPP/Tests/TestPolygons.cpp b/CPP/Tests/TestPolygons.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#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
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#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
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#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
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "clipper.h"
+#include "clipper2/clipper.h"
 
 using namespace Clipper2Lib;
 

diff --git a/CPP/Tests/TestPolytreeUnion.cpp b/CPP/Tests/TestPolytreeUnion.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "clipper.h"
+#include "clipper2/clipper.h"
 
 using namespace Clipper2Lib;
 

diff --git a/CPP/Tests/TestRandomPaths.cpp b/CPP/Tests/TestRandomPaths.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "clipper.h"
+#include "clipper2/clipper.h"
 #include <fstream>
 #include <random>
 

diff --git a/CPP/Tests/TestTrimCollinear.cpp b/CPP/Tests/TestTrimCollinear.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "clipper.h"
+#include "clipper2/clipper.h"
 
 using namespace Clipper2Lib;
 

diff --git a/CPP/Utils/ClipFileLoad.h b/CPP/Utils/ClipFileLoad.h
@@ -7,7 +7,7 @@
 
 #include <fstream>
 #include <string>
-#include "clipper.h"
+#include "clipper2/clipper.h"
 #ifndef _WIN32
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git 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
@@ -11,7 +11,7 @@
 
 #include <cstdlib>
 #include <string>
-#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
@@ -11,7 +11,7 @@
 
 #include <cstdlib>
 #include <string>
-#include "clipper.h"
+#include "clipper2/clipper.h"
 #include "clipper.svg.h"
 #ifndef _WIN32
 #include <sys/types.h>