Skip to content

Make REFLECTCPP_USE_BUNDLED_DEPENDENCIES option consistent with enchantum #581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DNKpp wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Make REFLECTCPP_USE_BUNDLED_DEPENDENCIES option consistent with enchantum #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d94c72c
chore: add enchantum target when REFLECTCPP_USE_BUNDLED_DEPENDENCIES …
DNKpp Jan 25, 2026
609d090
fix: include enchantum files without explicit thirdparty prefix
DNKpp Jan 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions include/rfl/enums.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion include/rfl/internal/enums/Names.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion include/rfl/internal/enums/get_enum_names.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include <concepts>
#include <utility>

#include "../../thirdparty/enchantum/enchantum.hpp"// NOLINT(unused-includes)
#include "enchantum/enchantum.hpp"// NOLINT(unused-includes)

Check failure on line 33 in include/rfl/internal/enums/get_enum_names.hpp

View workflow job for this annotation

GitHub Actions / (headers-C++20-gcc-13) 

enchantum/enchantum.hpp: No such file or directory

Check failure on line 33 in include/rfl/internal/enums/get_enum_names.hpp

View workflow job for this annotation

GitHub Actions / macos-latest (tests) 

'enchantum/enchantum.hpp' file not found

Check failure on line 33 in include/rfl/internal/enums/get_enum_names.hpp

View workflow job for this annotation

GitHub Actions / (headers-C++20-llvm-18) 

'enchantum/enchantum.hpp' file not found

Check failure on line 33 in include/rfl/internal/enums/get_enum_names.hpp

View workflow job for this annotation

GitHub Actions / (headers-C++20-llvm-16) 

'enchantum/enchantum.hpp' file not found

Check failure on line 33 in include/rfl/internal/enums/get_enum_names.hpp

View workflow job for this annotation

GitHub Actions / (headers-C++20-gcc-11) 

enchantum/enchantum.hpp: No such file or directory

Check failure on line 33 in include/rfl/internal/enums/get_enum_names.hpp

View workflow job for this annotation

GitHub Actions / (headers-C++23-gcc-14) 

enchantum/enchantum.hpp: No such file or directory

Check failure on line 33 in include/rfl/internal/enums/get_enum_names.hpp

View workflow job for this annotation

GitHub Actions / (headers-C++20-llvm-17) 

'enchantum/enchantum.hpp' file not found

Check failure on line 33 in include/rfl/internal/enums/get_enum_names.hpp

View workflow job for this annotation

GitHub Actions / (headers-C++23-gcc-13) 

enchantum/enchantum.hpp: No such file or directory

Check failure on line 33 in include/rfl/internal/enums/get_enum_names.hpp

View workflow job for this annotation

GitHub Actions / (headers-C++23-llvm-18) 

'enchantum/enchantum.hpp' file not found

Check failure on line 33 in include/rfl/internal/enums/get_enum_names.hpp

View workflow job for this annotation

GitHub Actions / (headers-C++20-gcc-14) 

enchantum/enchantum.hpp: No such file or directory

Check failure on line 33 in include/rfl/internal/enums/get_enum_names.hpp

View workflow job for this annotation

GitHub Actions / (headers-C++20-gcc-12) 

enchantum/enchantum.hpp: No such file or directory

Check failure on line 33 in include/rfl/internal/enums/get_enum_names.hpp

View workflow job for this annotation

GitHub Actions / macos-15-intel (tests) 

'enchantum/enchantum.hpp' file not found

#include "../../Literal.hpp"
#include "Names.hpp"
Expand Down
2 changes: 1 addition & 1 deletion include/rfl/parsing/Parser_basic_type.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion include/rfl/parsing/Parser_default.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion include/rfl/parsing/Parser_enum.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading