Move xml and svg to lower levels.

This commit is contained in:
jmsgrogan 2023-01-18 10:55:32 +00:00
parent 942cc2539c
commit 7cab70f839
32 changed files with 35 additions and 33 deletions

View file

@ -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)

View file

@ -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
)

View file

@ -23,6 +23,7 @@ list(APPEND graphics_HEADERS
AbstractPainter.h
DrawingSurface.h
)
if(UNIX)
set(OpenGL_GL_PREFERENCE "GLVND")
find_package(OpenGL QUIET)

View file

@ -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)

View file

@ -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)

View file

@ -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 )