From 410ee18a5c64f973b522027f710d780974b1a1bf Mon Sep 17 00:00:00 2001 From: TennesseeTrash Date: Sun, 15 Jun 2025 22:19:56 +0200 Subject: [PATCH 1/2] Use the static library alias provided by piguxml config --- CMake/pugixml.cmake | 2 +- Libraries/Kanimaji/CMakeLists.txt | 2 +- Libraries/Tablegen/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMake/pugixml.cmake b/CMake/pugixml.cmake index 996f4ed..b848487 100644 --- a/CMake/pugixml.cmake +++ b/CMake/pugixml.cmake @@ -1,4 +1,4 @@ -if(NOT TARGET pugixml-static) +if(NOT TARGET pugixml::static) include(FetchContent) FetchContent_Declare( diff --git a/Libraries/Kanimaji/CMakeLists.txt b/Libraries/Kanimaji/CMakeLists.txt index 2d0181a..512379f 100644 --- a/Libraries/Kanimaji/CMakeLists.txt +++ b/Libraries/Kanimaji/CMakeLists.txt @@ -12,7 +12,7 @@ target_link_libraries(Kanimaji KVGToolsCommon PRIVATE - pugixml-static + pugixml::static ) target_include_directories(Kanimaji diff --git a/Libraries/Tablegen/CMakeLists.txt b/Libraries/Tablegen/CMakeLists.txt index 5cd1481..7d14ce3 100644 --- a/Libraries/Tablegen/CMakeLists.txt +++ b/Libraries/Tablegen/CMakeLists.txt @@ -17,7 +17,7 @@ target_link_libraries(Tablegen KVGToolsCommon PRIVATE - pugixml-static + pugixml::static ) target_sources(Tablegen From f15db30fb9b15fc1e2ec0f096e9339df223bbcae Mon Sep 17 00:00:00 2001 From: TennesseeTrash Date: Sun, 15 Jun 2025 22:21:23 +0200 Subject: [PATCH 2/2] [Tablegen] Use a references, instead of copies --- Libraries/Tablegen/Include/Tablegen/Tablegen.hpp | 9 +++++---- Libraries/Tablegen/Source/Tablegen.cpp | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Libraries/Tablegen/Include/Tablegen/Tablegen.hpp b/Libraries/Tablegen/Include/Tablegen/Tablegen.hpp index aa97c82..84a78ef 100644 --- a/Libraries/Tablegen/Include/Tablegen/Tablegen.hpp +++ b/Libraries/Tablegen/Include/Tablegen/Tablegen.hpp @@ -12,17 +12,18 @@ namespace Tablegen { - std::string GeneratePage(std::vector characters, + std::string GeneratePage(const std::vector& characters, const Settings& settings = Settings::Default()); - void GeneratePage(const std::string& path, std::vector characters, + void GeneratePage(const std::string& path, const std::vector& characters, const Settings& settings = Settings::Default()); # ifdef TABLEGEN_EXPOSE_XML - void GenerateAsChild(pugi::xml_node& node, std::vector characters, + void GenerateAsChild(pugi::xml_node& node, const std::vector& characters, const Settings& settings = Settings::Default()); - pugi::xml_document GenerateDocument(std::vector characters, const Settings& settings = Settings::Default()); + pugi::xml_document GenerateDocument(const std::vector& characters, + const Settings& settings = Settings::Default()); # endif } diff --git a/Libraries/Tablegen/Source/Tablegen.cpp b/Libraries/Tablegen/Source/Tablegen.cpp index 248e605..2edb766 100644 --- a/Libraries/Tablegen/Source/Tablegen.cpp +++ b/Libraries/Tablegen/Source/Tablegen.cpp @@ -95,7 +95,7 @@ namespace Tablegen } } - std::string GeneratePage(std::vector characters, const Settings& settings) + std::string GeneratePage(const std::vector& characters, const Settings& settings) { pugi::xml_document doc = GenerateDocument(characters, settings); @@ -106,7 +106,7 @@ namespace Tablegen return str.str(); } - void GeneratePage(const std::string& path, std::vector characters, + void GeneratePage(const std::string& path, const std::vector& characters, const Settings& settings) { pugi::xml_document doc = GenerateDocument(characters, settings); @@ -116,7 +116,7 @@ namespace Tablegen doc.save_file("test.html", " ", formatOptions); } - void GenerateAsChild(pugi::xml_node& node, std::vector characters, + void GenerateAsChild(pugi::xml_node& node, const std::vector& characters, const Settings& settings) { pugi::xml_node tableRoot = node; @@ -203,7 +203,7 @@ namespace Tablegen script.append_child(pugi::node_pcdata).set_value(Script(indent, tagIndent, buttons)); } - pugi::xml_document GenerateDocument(std::vector characters, + pugi::xml_document GenerateDocument(const std::vector& characters, const Settings& settings) { pugi::xml_document doc;