diff --git a/CMakeLists.txt b/CMakeLists.txt index f407750f1..beeb9ee28 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,10 +38,7 @@ find_package(base64 CONFIG REQUIRED) find_package(Boost CONFIG REQUIRED) find_package(concurrentqueue CONFIG REQUIRED) find_package(cpptrace CONFIG REQUIRED) -#find_package(EnTT CONFIG REQUIRED) -include(FetchContent) -FetchContent_Declare(EnTT URL https://github.com/skypjack/entt/archive/41aab920b083aa424ac1d27666ce287eeaff6ceb.tar.gz) -FetchContent_MakeAvailable(EnTT) +find_package(EnTT CONFIG REQUIRED) find_package(expected-lite REQUIRED) find_package(fmt CONFIG REQUIRED) find_package(funchook CONFIG REQUIRED) diff --git a/conanfile.py b/conanfile.py index 4ae1ec1c2..15f0da944 100644 --- a/conanfile.py +++ b/conanfile.py @@ -112,7 +112,7 @@ def requirements(self): self.requires("boost/1.85.0") self.requires("concurrentqueue/1.0.4") self.requires("cpptrace/0.7.1") - # self.requires("entt/3.13.0") + self.requires("entt/3.14.0") self.requires("expected-lite/0.8.0") self.requires("fmt/[~10]", transitive_headers=True, transitive_libs=True) self.requires("funchook/1.1.3") @@ -177,7 +177,7 @@ def package_info(self): "boost::boost", "concurrentqueue::concurrentqueue", "cpptrace::cpptrace", - # "entt::entt", + "entt::entt", "glm::glm", "magic_enum::magic_enum", "nlohmann_json::nlohmann_json",