M .gitmodules => .gitmodules +1 -1
@@ 48,7 48,7 @@
path = module-bluetooth/lib/btstack
url = ../btstack.git
[submodule "module-utils/pugixml"]
- path = module-utils/pugixml
+ path = third-party/pugixml
url = ../pugixml.git
[submodule "module-utils/magic_enum"]
path = third-party/magic_enum
M cmake/modules/PureCoverage.cmake => cmake/modules/PureCoverage.cmake +1 -1
@@ 34,7 34,7 @@ if(COVERAGE_ENABLE)
module-utils/microtar/.*
module-utils/parallel-hashmap/.*
module-utils/protobuf/.*
- module-utils/pugixml/.*
+ third-party/pugixml/.*
module-utils/re2/.*
module-utils/segger/.*
module-utils/sml/.*
M module-gui/CMakeLists.txt => module-gui/CMakeLists.txt +7 -1
@@ 21,7 21,13 @@ include(gui/dom/CMakeLists.txt)
include_directories( ../module-utils )
-target_link_libraries(${PROJECT_NAME} PUBLIC module-utils ${TARGET_LIBRARIES} )
+target_link_libraries(${PROJECT_NAME}
+ PUBLIC
+ module-utils
+ ${TARGET_LIBRARIES}
+ PRIVATE
+ pugixml::pugixml
+)
# Board specific compilation definitions,options,include directories and features
target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_CONFIG_DEFINITIONS})
M module-gui/gui/widgets/RichTextParser.cpp => module-gui/gui/widgets/RichTextParser.cpp +1 -1
@@ 12,7 12,7 @@
#include <log/log.hpp>
#include "TextFormat.hpp"
-#include <module-utils/pugixml/src/pugixml.hpp>
+#include <pugixml.hpp>
#include <module-utils/Utils.hpp>
#include <utility>
M module-utils/CMakeLists.txt => module-utils/CMakeLists.txt +0 -4
@@ 53,7 53,6 @@ include(third-party/re2.cmake)
include(third-party/protobuf-lite.cmake)
include(third-party/libphonenumber.cmake)
include(third-party/tinyexpr.cmake)
-include(third-party/pugixml.cmake)
# link against libphonenumber
target_link_libraries (${PROJECT_NAME} PUBLIC ${LIBPHONENUMBER_TARGET})
@@ 71,9 70,6 @@ target_link_libraries(${PROJECT_NAME} PRIVATE crc32 )
# link against tinyexpr
target_link_libraries (${PROJECT_NAME} PUBLIC ${TINYEXPR_TARGET})
-# link against pugixml
-target_link_libraries (${PROJECT_NAME} PUBLIC ${PUGIXML_TARGET})
-
target_link_libraries(${PROJECT_NAME}
PUBLIC
module-os
D module-utils/pugixml => module-utils/pugixml +0 -1
@@ 1,1 0,0 @@
-Subproject commit 3594fd01041663c4a2f3f149e47d71835863fb02
M third-party/CMakeLists.txt => third-party/CMakeLists.txt +1 -0
@@ 3,3 3,4 @@ add_subdirectory(crc32)
add_subdirectory(magic_enum)
add_subdirectory(microtar)
add_subdirectory(date)
+add_subdirectory(pugixml)
A third-party/pugixml => third-party/pugixml +1 -0
@@ 0,0 1,1 @@
+Subproject commit 3594fd01041663c4a2f3f149e47d71835863fb02