diff --git a/CMakeLists.txt b/CMakeLists.txt index 270f5c28..bec600e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -216,7 +216,10 @@ else () if (NOT TARGET ctre::ctre) find_package(ctre CONFIG REQUIRED) endif () - target_link_libraries(reflectcpp PUBLIC ctre::ctre) + if (NOT TARGET enchantum::enchantum) + find_package(enchantum CONFIG REQUIRED) + endif () + target_link_libraries(reflectcpp PUBLIC ctre::ctre enchantum::enchantum) endif () if (_REFLECTCPP_NEEDS_JSON_IMPL) diff --git a/include/rfl/enums.hpp b/include/rfl/enums.hpp index f2cab910..cc350eeb 100644 --- a/include/rfl/enums.hpp +++ b/include/rfl/enums.hpp @@ -6,8 +6,8 @@ #include "Result.hpp" #include "internal/enums/get_enum_names.hpp" #include "internal/strings/strings.hpp" -#include "thirdparty/enchantum/enchantum.hpp" -#include "thirdparty/enchantum/bitflags.hpp" +#include "enchantum/enchantum.hpp" +#include "enchantum/bitflags.hpp" namespace rfl { diff --git a/include/rfl/internal/enums/Names.hpp b/include/rfl/internal/enums/Names.hpp index a35944ad..8b40a63f 100644 --- a/include/rfl/internal/enums/Names.hpp +++ b/include/rfl/internal/enums/Names.hpp @@ -10,7 +10,7 @@ //#include "../../config.hpp" //#include "../../define_literal.hpp" #include "../../make_named_tuple.hpp" -//#include "../../thirdparty/enchantum/enchantum.hpp" +//#include "enchantum/enchantum.hpp" #include "../StringLiteral.hpp" namespace rfl::internal::enums { diff --git a/include/rfl/internal/enums/get_enum_names.hpp b/include/rfl/internal/enums/get_enum_names.hpp index b81a7153..ac846103 100644 --- a/include/rfl/internal/enums/get_enum_names.hpp +++ b/include/rfl/internal/enums/get_enum_names.hpp @@ -30,7 +30,7 @@ #include #include -#include "../../thirdparty/enchantum/enchantum.hpp"// NOLINT(unused-includes) +#include "enchantum/enchantum.hpp"// NOLINT(unused-includes) #include "../../Literal.hpp" #include "Names.hpp" diff --git a/include/rfl/parsing/Parser_basic_type.hpp b/include/rfl/parsing/Parser_basic_type.hpp index 38587aff..fe7c3a93 100644 --- a/include/rfl/parsing/Parser_basic_type.hpp +++ b/include/rfl/parsing/Parser_basic_type.hpp @@ -20,7 +20,7 @@ #include "../internal/processed_t.hpp" #include "../internal/ptr_cast.hpp" #include "../internal/to_ptr_named_tuple.hpp" -#include "../thirdparty/enchantum/enchantum.hpp" +#include "enchantum/enchantum.hpp" #include "../to_view.hpp" #include "AreReaderAndWriter.hpp" #include "Parent.hpp" diff --git a/include/rfl/parsing/Parser_default.hpp b/include/rfl/parsing/Parser_default.hpp index 1114cdaa..393a6c52 100644 --- a/include/rfl/parsing/Parser_default.hpp +++ b/include/rfl/parsing/Parser_default.hpp @@ -20,7 +20,7 @@ #include "../internal/processed_t.hpp" #include "../internal/ptr_cast.hpp" #include "../internal/to_ptr_named_tuple.hpp" -#include "../thirdparty/enchantum/enchantum.hpp" +#include "enchantum/enchantum.hpp" #include "../to_view.hpp" #include "AreReaderAndWriter.hpp" #include "Parent.hpp" diff --git a/include/rfl/parsing/Parser_enum.hpp b/include/rfl/parsing/Parser_enum.hpp index 283b94ba..4b5868d8 100644 --- a/include/rfl/parsing/Parser_enum.hpp +++ b/include/rfl/parsing/Parser_enum.hpp @@ -6,7 +6,7 @@ #include "../Result.hpp" #include "../enums.hpp" -#include "../thirdparty/enchantum/enchantum.hpp" +#include "enchantum/enchantum.hpp" #include "AreReaderAndWriter.hpp" #include "Parent.hpp" #include "Parser_base.hpp"