Make headers include relative to project-root. (openscad#5312)

Author: hzeller

CMakeLists.txt

@@ -511,12 +511,16 @@ endif()
 
 target_include_directories(OpenSCAD PRIVATE
   "src"
-  "src/core"
-  "src/core/customizer"
   "src/ext"
-  "src/ext/json"
   "src/ext/lexertl/include"
   "src/ext/libtess2/Include"
+
+  # All the following should go away, not needed anymore after
+  # PR #5312. Left here for now in case there are on-going PRs that
+  # rely on these. Should be removed soon.
+  "src/core"
+  "src/core/customizer"
+  "src/ext/json"
   "src/ext"
   "src/geometry"
   "src/geometry/cgal"

src/Cache.h

@@ -46,7 +46,7 @@
 
 #include <cstddef>
 #include <unordered_map>
-#include "printutils.h"
+#include "utils/printutils.h"
 
 template <class Key, class T>
 class Cache

src/Feature.cc

@@ -8,7 +8,7 @@
 #include <utility>
 
 #include "Feature.h"
-#include "printutils.h"
+#include "utils/printutils.h"
 
 /**
  * Feature registration map/list for later lookup. This must be initialized

src/Feature.h

@@ -6,7 +6,7 @@
 #include <map>
 #include <vector>
 
-#include "exceptions.h"
+#include "utils/exceptions.h"
 
 class Feature
 {

src/FontCache.cc

@@ -33,9 +33,9 @@
 #include <utility>
 
 #include "FontCache.h"
-#include "PlatformUtils.h"
-#include "printutils.h"
-#include "version_helper.h"
+#include "platform/PlatformUtils.h"
+#include "utils/printutils.h"
+#include "utils/version_helper.h"
 
 extern std::vector<std::string> librarypath;
 

src/LibraryInfo.cc

@@ -3,8 +3,8 @@
 #include <string>
 #include <vector>
 
-#include "version_check.h"
-#include "PlatformUtils.h"
+#include "utils/version_check.h"
+#include "platform/PlatformUtils.h"
 #include "version.h"
 #include "Feature.h"
 
@@ -13,11 +13,11 @@
 
 #ifndef OPENSCAD_NOGUI
 #include <Qsci/qsciglobal.h>
-#include "input/InputDriverManager.h"
+#include "gui/input/InputDriverManager.h"
 #endif
 
 #ifdef ENABLE_CGAL
-#include "cgal.h"
+#include "geometry/cgal/cgal.h"
 #include <boost/algorithm/string.hpp>
 #if defined(__GNUG__)
 #define GCC_INT_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100)

src/RenderStatistic.cc

@@ -25,23 +25,23 @@
 
 
 #include <fstream>
-#include <json.hpp>
+#include "json/json.hpp"
 #include <string>
 #include <vector>
 
-#include "printutils.h"
-#include "GeometryCache.h"
-#include "PolySet.h"
-#include "Polygon2d.h"
+#include "utils/printutils.h"
+#include "geometry/GeometryCache.h"
+#include "geometry/PolySet.h"
+#include "geometry/Polygon2d.h"
 #ifdef ENABLE_CGAL
-#include "CGAL_Nef_polyhedron.h"
-#include "CGALHybridPolyhedron.h"
-#include "CGALCache.h"
+#include "geometry/cgal/CGAL_Nef_polyhedron.h"
+#include "geometry/cgal/CGALHybridPolyhedron.h"
+#include "geometry/cgal/CGALCache.h"
 #endif // ENABLE_CGAL
 
 #ifdef ENABLE_MANIFOLD
-#include "ManifoldGeometry.h"
-#include "manifoldutils.h"
+#include "geometry/manifold/ManifoldGeometry.h"
+#include "geometry/manifold/manifoldutils.h"
 #endif // ENABLE_MANIFOLD
 
 #include "RenderStatistic.h"

src/RenderStatistic.h

@@ -29,8 +29,8 @@
 #include <string>
 #include <vector>
 
-#include "Camera.h"
-#include "Geometry.h"
+#include "glview/Camera.h"
+#include "geometry/Geometry.h"
 
 /**
  * An utility class to collect and print rendering statistics for the given

src/core/AST.cc

@@ -1,7 +1,7 @@
-#include "AST.h"
+#include "core/AST.h"
 #include <sstream>
 #include <string>
-#include "boost-utils.h"
+#include "utils/boost-utils.h"
 
 const Location Location::NONE(0, 0, 0, 0, std::make_shared<fs::path>(fs::path{}));
 

src/core/Arguments.cc

@@ -24,8 +24,8 @@
  *
  */
 
-#include "Arguments.h"
-#include "Expression.h"
+#include "core/Arguments.h"
+#include "core/Expression.h"
 
 Arguments::Arguments(const AssignmentList& argument_expressions, const std::shared_ptr<const Context>& context) :
   evaluation_session(context->session())