From 7cab70f839c6cf72b5467f4098b4d56a38338adc Mon Sep 17 00:00:00 2001 From: jmsgrogan Date: Wed, 18 Jan 2023 10:55:32 +0000 Subject: [PATCH] Move xml and svg to lower levels. --- src/base/core/CMakeLists.txt | 17 ++++++++++- src/{web => base/core}/xml/XmlDocument.cpp | 0 src/{web => base/core}/xml/XmlDocument.h | 0 src/{web => base/core}/xml/XmlParser.cpp | 0 src/{web => base/core}/xml/XmlParser.h | 0 src/{web => base/core}/xml/XmlWriter.cpp | 0 src/{web => base/core}/xml/XmlWriter.h | 0 .../core}/xml/xml-elements/XmlAttribute.cpp | 0 .../core}/xml/xml-elements/XmlAttribute.h | 0 .../core}/xml/xml-elements/XmlElement.cpp | 0 .../core}/xml/xml-elements/XmlElement.h | 0 .../core}/xml/xml-elements/XmlProlog.cpp | 0 .../core}/xml/xml-elements/XmlProlog.h | 0 src/publishing/CMakeLists.txt | 2 -- src/rendering/graphics/CMakeLists.txt | 1 + src/rendering/visual_elements/CMakeLists.txt | 16 ++++++++++ .../visual_elements}/svg/SvgDocument.cpp | 0 .../visual_elements}/svg/SvgDocument.h | 0 .../visual_elements}/svg/SvgElement.cpp | 0 .../visual_elements}/svg/SvgElement.h | 0 .../visual_elements}/svg/SvgNode.cpp | 0 .../visual_elements}/svg/SvgNode.h | 0 .../visual_elements}/svg/SvgReader.cpp | 0 .../visual_elements}/svg/SvgReader.h | 0 .../visual_elements}/svg/SvgShapeElement.cpp | 0 .../visual_elements}/svg/SvgShapeElement.h | 0 .../visual_elements}/svg/SvgWriter.cpp | 0 .../visual_elements}/svg/SvgWriter.h | 0 .../svg/elements/SvgShapeElements.cpp | 0 .../svg/elements/SvgShapeElements.h | 0 src/ui/ui_elements/CMakeLists.txt | 2 +- src/web/CMakeLists.txt | 30 +------------------ 32 files changed, 35 insertions(+), 33 deletions(-) rename src/{web => base/core}/xml/XmlDocument.cpp (100%) rename src/{web => base/core}/xml/XmlDocument.h (100%) rename src/{web => base/core}/xml/XmlParser.cpp (100%) rename src/{web => base/core}/xml/XmlParser.h (100%) rename src/{web => base/core}/xml/XmlWriter.cpp (100%) rename src/{web => base/core}/xml/XmlWriter.h (100%) rename src/{web => base/core}/xml/xml-elements/XmlAttribute.cpp (100%) rename src/{web => base/core}/xml/xml-elements/XmlAttribute.h (100%) rename src/{web => base/core}/xml/xml-elements/XmlElement.cpp (100%) rename src/{web => base/core}/xml/xml-elements/XmlElement.h (100%) rename src/{web => base/core}/xml/xml-elements/XmlProlog.cpp (100%) rename src/{web => base/core}/xml/xml-elements/XmlProlog.h (100%) rename src/{web => rendering/visual_elements}/svg/SvgDocument.cpp (100%) rename src/{web => rendering/visual_elements}/svg/SvgDocument.h (100%) rename src/{web => rendering/visual_elements}/svg/SvgElement.cpp (100%) rename src/{web => rendering/visual_elements}/svg/SvgElement.h (100%) rename src/{publishing => rendering/visual_elements}/svg/SvgNode.cpp (100%) rename src/{publishing => rendering/visual_elements}/svg/SvgNode.h (100%) rename src/{web => rendering/visual_elements}/svg/SvgReader.cpp (100%) rename src/{web => rendering/visual_elements}/svg/SvgReader.h (100%) rename src/{web => rendering/visual_elements}/svg/SvgShapeElement.cpp (100%) rename src/{web => rendering/visual_elements}/svg/SvgShapeElement.h (100%) rename src/{web => rendering/visual_elements}/svg/SvgWriter.cpp (100%) rename src/{web => rendering/visual_elements}/svg/SvgWriter.h (100%) rename src/{web => rendering/visual_elements}/svg/elements/SvgShapeElements.cpp (100%) rename src/{web => rendering/visual_elements}/svg/elements/SvgShapeElements.h (100%) diff --git a/src/base/core/CMakeLists.txt b/src/base/core/CMakeLists.txt index 6bca68d..95aac1b 100644 --- a/src/base/core/CMakeLists.txt +++ b/src/base/core/CMakeLists.txt @@ -24,6 +24,12 @@ list(APPEND HEADERS http/HttpRequest.h serializers/TomlReader.h Win32BaseIncludes.h + xml/XmlParser.h + xml/XmlDocument.h + xml/XmlWriter.h + xml/xml-elements/XmlElement.h + xml/xml-elements/XmlAttribute.h + xml/xml-elements/XmlProlog.h ) list(APPEND SOURCES @@ -51,7 +57,14 @@ list(APPEND SOURCES http/HttpResponse.cpp http/HttpHeader.cpp http/HttpRequest.cpp - serializers/TomlReader.cpp) + serializers/TomlReader.cpp + xml/XmlParser.cpp + xml/XmlDocument.cpp + xml/XmlWriter.cpp + xml/xml-elements/XmlElement.cpp + xml/xml-elements/XmlAttribute.cpp + xml/xml-elements/XmlProlog.cpp + ) add_library(${MODULE_NAME} SHARED ${SOURCES} ${HEADERS}) @@ -65,6 +78,8 @@ target_include_directories(${MODULE_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/http ${CMAKE_CURRENT_SOURCE_DIR}/data_structures ${CMAKE_CURRENT_SOURCE_DIR}/serializers + ${CMAKE_CURRENT_SOURCE_DIR}/xml + ${CMAKE_CURRENT_SOURCE_DIR}/xml/xml-elements ) set_target_properties( ${MODULE_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON ) set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src/base) \ No newline at end of file diff --git a/src/web/xml/XmlDocument.cpp b/src/base/core/xml/XmlDocument.cpp similarity index 100% rename from src/web/xml/XmlDocument.cpp rename to src/base/core/xml/XmlDocument.cpp diff --git a/src/web/xml/XmlDocument.h b/src/base/core/xml/XmlDocument.h similarity index 100% rename from src/web/xml/XmlDocument.h rename to src/base/core/xml/XmlDocument.h diff --git a/src/web/xml/XmlParser.cpp b/src/base/core/xml/XmlParser.cpp similarity index 100% rename from src/web/xml/XmlParser.cpp rename to src/base/core/xml/XmlParser.cpp diff --git a/src/web/xml/XmlParser.h b/src/base/core/xml/XmlParser.h similarity index 100% rename from src/web/xml/XmlParser.h rename to src/base/core/xml/XmlParser.h diff --git a/src/web/xml/XmlWriter.cpp b/src/base/core/xml/XmlWriter.cpp similarity index 100% rename from src/web/xml/XmlWriter.cpp rename to src/base/core/xml/XmlWriter.cpp diff --git a/src/web/xml/XmlWriter.h b/src/base/core/xml/XmlWriter.h similarity index 100% rename from src/web/xml/XmlWriter.h rename to src/base/core/xml/XmlWriter.h diff --git a/src/web/xml/xml-elements/XmlAttribute.cpp b/src/base/core/xml/xml-elements/XmlAttribute.cpp similarity index 100% rename from src/web/xml/xml-elements/XmlAttribute.cpp rename to src/base/core/xml/xml-elements/XmlAttribute.cpp diff --git a/src/web/xml/xml-elements/XmlAttribute.h b/src/base/core/xml/xml-elements/XmlAttribute.h similarity index 100% rename from src/web/xml/xml-elements/XmlAttribute.h rename to src/base/core/xml/xml-elements/XmlAttribute.h diff --git a/src/web/xml/xml-elements/XmlElement.cpp b/src/base/core/xml/xml-elements/XmlElement.cpp similarity index 100% rename from src/web/xml/xml-elements/XmlElement.cpp rename to src/base/core/xml/xml-elements/XmlElement.cpp diff --git a/src/web/xml/xml-elements/XmlElement.h b/src/base/core/xml/xml-elements/XmlElement.h similarity index 100% rename from src/web/xml/xml-elements/XmlElement.h rename to src/base/core/xml/xml-elements/XmlElement.h diff --git a/src/web/xml/xml-elements/XmlProlog.cpp b/src/base/core/xml/xml-elements/XmlProlog.cpp similarity index 100% rename from src/web/xml/xml-elements/XmlProlog.cpp rename to src/base/core/xml/xml-elements/XmlProlog.cpp diff --git a/src/web/xml/xml-elements/XmlProlog.h b/src/base/core/xml/xml-elements/XmlProlog.h similarity index 100% rename from src/web/xml/xml-elements/XmlProlog.h rename to src/base/core/xml/xml-elements/XmlProlog.h diff --git a/src/publishing/CMakeLists.txt b/src/publishing/CMakeLists.txt index 766fd8f..c79e65f 100644 --- a/src/publishing/CMakeLists.txt +++ b/src/publishing/CMakeLists.txt @@ -15,7 +15,6 @@ list(APPEND publishing_HEADERS latex/LatexDocument.h latex/LatexMathExpression.h latex/LatexSymbols.h - svg/SvgNode.h svg/SvgPainter.h DocumentConverter.h ) @@ -38,7 +37,6 @@ list(APPEND publishing_LIB_INCLUDES plotting/PlotNode.cpp plotting/EquationNode.cpp DocumentConverter.cpp - svg/SvgNode.cpp svg/SvgPainter.cpp ) diff --git a/src/rendering/graphics/CMakeLists.txt b/src/rendering/graphics/CMakeLists.txt index b36a977..9a3de33 100644 --- a/src/rendering/graphics/CMakeLists.txt +++ b/src/rendering/graphics/CMakeLists.txt @@ -23,6 +23,7 @@ list(APPEND graphics_HEADERS AbstractPainter.h DrawingSurface.h ) + if(UNIX) set(OpenGL_GL_PREFERENCE "GLVND") find_package(OpenGL QUIET) diff --git a/src/rendering/visual_elements/CMakeLists.txt b/src/rendering/visual_elements/CMakeLists.txt index 15b5a6c..3522bbe 100644 --- a/src/rendering/visual_elements/CMakeLists.txt +++ b/src/rendering/visual_elements/CMakeLists.txt @@ -16,6 +16,20 @@ list(APPEND visual_elements_LIB_INCLUDES scene/SceneItem.cpp scene/SceneText.h scene/SceneText.cpp + svg/SvgNode.h + svg/SvgNode.cpp + svg/SvgDocument.h + svg/SvgWriter.h + svg/SvgReader.h + svg/SvgShapeElement.h + svg/SvgElement.h + svg/elements/SvgShapeElements.h + svg/SvgDocument.cpp + svg/SvgReader.cpp + svg/SvgWriter.cpp + svg/SvgShapeElement.cpp + svg/SvgElement.cpp + svg/elements/SvgShapeElements.cpp nodes/MaterialNode.h nodes/MaterialNode.cpp nodes/MeshNode.h @@ -38,6 +52,8 @@ target_include_directories(${MODULE_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/basic_shapes ${CMAKE_CURRENT_SOURCE_DIR}/scene ${CMAKE_CURRENT_SOURCE_DIR}/nodes + ${CMAKE_CURRENT_SOURCE_DIR}/svg + ${CMAKE_CURRENT_SOURCE_DIR}/svg/elements ) target_link_libraries(${MODULE_NAME} PUBLIC core geometry fonts mesh image) diff --git a/src/web/svg/SvgDocument.cpp b/src/rendering/visual_elements/svg/SvgDocument.cpp similarity index 100% rename from src/web/svg/SvgDocument.cpp rename to src/rendering/visual_elements/svg/SvgDocument.cpp diff --git a/src/web/svg/SvgDocument.h b/src/rendering/visual_elements/svg/SvgDocument.h similarity index 100% rename from src/web/svg/SvgDocument.h rename to src/rendering/visual_elements/svg/SvgDocument.h diff --git a/src/web/svg/SvgElement.cpp b/src/rendering/visual_elements/svg/SvgElement.cpp similarity index 100% rename from src/web/svg/SvgElement.cpp rename to src/rendering/visual_elements/svg/SvgElement.cpp diff --git a/src/web/svg/SvgElement.h b/src/rendering/visual_elements/svg/SvgElement.h similarity index 100% rename from src/web/svg/SvgElement.h rename to src/rendering/visual_elements/svg/SvgElement.h diff --git a/src/publishing/svg/SvgNode.cpp b/src/rendering/visual_elements/svg/SvgNode.cpp similarity index 100% rename from src/publishing/svg/SvgNode.cpp rename to src/rendering/visual_elements/svg/SvgNode.cpp diff --git a/src/publishing/svg/SvgNode.h b/src/rendering/visual_elements/svg/SvgNode.h similarity index 100% rename from src/publishing/svg/SvgNode.h rename to src/rendering/visual_elements/svg/SvgNode.h diff --git a/src/web/svg/SvgReader.cpp b/src/rendering/visual_elements/svg/SvgReader.cpp similarity index 100% rename from src/web/svg/SvgReader.cpp rename to src/rendering/visual_elements/svg/SvgReader.cpp diff --git a/src/web/svg/SvgReader.h b/src/rendering/visual_elements/svg/SvgReader.h similarity index 100% rename from src/web/svg/SvgReader.h rename to src/rendering/visual_elements/svg/SvgReader.h diff --git a/src/web/svg/SvgShapeElement.cpp b/src/rendering/visual_elements/svg/SvgShapeElement.cpp similarity index 100% rename from src/web/svg/SvgShapeElement.cpp rename to src/rendering/visual_elements/svg/SvgShapeElement.cpp diff --git a/src/web/svg/SvgShapeElement.h b/src/rendering/visual_elements/svg/SvgShapeElement.h similarity index 100% rename from src/web/svg/SvgShapeElement.h rename to src/rendering/visual_elements/svg/SvgShapeElement.h diff --git a/src/web/svg/SvgWriter.cpp b/src/rendering/visual_elements/svg/SvgWriter.cpp similarity index 100% rename from src/web/svg/SvgWriter.cpp rename to src/rendering/visual_elements/svg/SvgWriter.cpp diff --git a/src/web/svg/SvgWriter.h b/src/rendering/visual_elements/svg/SvgWriter.h similarity index 100% rename from src/web/svg/SvgWriter.h rename to src/rendering/visual_elements/svg/SvgWriter.h diff --git a/src/web/svg/elements/SvgShapeElements.cpp b/src/rendering/visual_elements/svg/elements/SvgShapeElements.cpp similarity index 100% rename from src/web/svg/elements/SvgShapeElements.cpp rename to src/rendering/visual_elements/svg/elements/SvgShapeElements.cpp diff --git a/src/web/svg/elements/SvgShapeElements.h b/src/rendering/visual_elements/svg/elements/SvgShapeElements.h similarity index 100% rename from src/web/svg/elements/SvgShapeElements.h rename to src/rendering/visual_elements/svg/elements/SvgShapeElements.h diff --git a/src/ui/ui_elements/CMakeLists.txt b/src/ui/ui_elements/CMakeLists.txt index e416a8b..7bd2baf 100644 --- a/src/ui/ui_elements/CMakeLists.txt +++ b/src/ui/ui_elements/CMakeLists.txt @@ -49,7 +49,7 @@ target_include_directories(${MODULE_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/ui_events ${CMAKE_CURRENT_SOURCE_DIR}/desktop_elements ) -target_link_libraries(${MODULE_NAME} PUBLIC core geometry graphics visual_elements image web) +target_link_libraries(${MODULE_NAME} PUBLIC core geometry graphics visual_elements image) set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src/ui) diff --git a/src/web/CMakeLists.txt b/src/web/CMakeLists.txt index 992ae84..81d2ad4 100644 --- a/src/web/CMakeLists.txt +++ b/src/web/CMakeLists.txt @@ -1,18 +1,6 @@ set(MODULE_NAME web) list(APPEND web_LIB_INCLUDES - xml/XmlParser.h - xml/XmlParser.cpp - xml/XmlDocument.h - xml/XmlDocument.cpp - xml/XmlWriter.h - xml/XmlWriter.cpp - xml/xml-elements/XmlElement.h - xml/xml-elements/XmlElement.cpp - xml/xml-elements/XmlAttribute.h - xml/xml-elements/XmlAttribute.cpp - xml/xml-elements/XmlProlog.h - xml/xml-elements/XmlProlog.cpp markdown/MarkdownParser.cpp markdown/MarkdownConverter.cpp markdown/MarkdownDocument.h @@ -27,18 +15,6 @@ list(APPEND web_LIB_INCLUDES html/elements/HtmlHeadElement.cpp html/elements/HtmlBodyElement.cpp html/elements/HtmlParagraphElement.cpp - svg/SvgDocument.h - svg/SvgWriter.h - svg/SvgReader.h - svg/SvgShapeElement.h - svg/SvgElement.h - svg/elements/SvgShapeElements.h - svg/SvgDocument.cpp - svg/SvgReader.cpp - svg/SvgWriter.cpp - svg/SvgShapeElement.cpp - svg/SvgElement.cpp - svg/elements/SvgShapeElements.cpp ) # add the executable @@ -46,14 +22,10 @@ add_library(${MODULE_NAME} SHARED ${web_LIB_INCLUDES}) target_include_directories(web PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/svg - ${CMAKE_CURRENT_SOURCE_DIR}/svg/elements - ${CMAKE_CURRENT_SOURCE_DIR}/xml - ${CMAKE_CURRENT_SOURCE_DIR}/xml/xml-elements ${CMAKE_CURRENT_SOURCE_DIR}/html ${CMAKE_CURRENT_SOURCE_DIR}/html/elements ${CMAKE_CURRENT_SOURCE_DIR}/markdown ) set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER src) -target_link_libraries(${MODULE_NAME} PUBLIC core compiler geometry) +target_link_libraries(${MODULE_NAME} PUBLIC core compiler) set_target_properties( ${MODULE_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON ) \ No newline at end of file