diff --git a/CMake/pugixml.cmake b/CMake/pugixml.cmake index b848487..996f4ed 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 512379f..2d0181a 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 7d14ce3..5cd1481 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 diff --git a/Libraries/Tablegen/Include/Tablegen/Tablegen.hpp b/Libraries/Tablegen/Include/Tablegen/Tablegen.hpp index 84a78ef..aa97c82 100644 --- a/Libraries/Tablegen/Include/Tablegen/Tablegen.hpp +++ b/Libraries/Tablegen/Include/Tablegen/Tablegen.hpp @@ -12,18 +12,17 @@ namespace Tablegen { - std::string GeneratePage(const std::vector& characters, + std::string GeneratePage(std::vector characters, const Settings& settings = Settings::Default()); - void GeneratePage(const std::string& path, const std::vector& characters, + void GeneratePage(const std::string& path, std::vector characters, const Settings& settings = Settings::Default()); # ifdef TABLEGEN_EXPOSE_XML - void GenerateAsChild(pugi::xml_node& node, const std::vector& characters, + void GenerateAsChild(pugi::xml_node& node, std::vector characters, const Settings& settings = Settings::Default()); - pugi::xml_document GenerateDocument(const std::vector& characters, - const Settings& settings = Settings::Default()); + pugi::xml_document GenerateDocument(std::vector characters, const Settings& settings = Settings::Default()); # endif } diff --git a/Libraries/Tablegen/Source/Tablegen.cpp b/Libraries/Tablegen/Source/Tablegen.cpp index 2edb766..248e605 100644 --- a/Libraries/Tablegen/Source/Tablegen.cpp +++ b/Libraries/Tablegen/Source/Tablegen.cpp @@ -95,7 +95,7 @@ namespace Tablegen } } - std::string GeneratePage(const std::vector& characters, const Settings& settings) + std::string GeneratePage(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, const std::vector& characters, + void GeneratePage(const std::string& path, 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, const std::vector& characters, + void GenerateAsChild(pugi::xml_node& node, 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(const std::vector& characters, + pugi::xml_document GenerateDocument(std::vector characters, const Settings& settings) { pugi::xml_document doc;