From f1dd5107f820fe86cb6b6b9ca22d42e0a3a3cf30 Mon Sep 17 00:00:00 2001 From: Green Sky Date: Sat, 20 Jul 2024 23:07:34 +0200 Subject: [PATCH] add file obj comp to prep for move we now depend on os --- external/CMakeLists.txt | 9 +++++++++ src/CMakeLists.txt | 1 + src/solanaceae/message3/components.hpp | 8 ++++++-- src/solanaceae/message3/components_id.inl | 1 + 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index d0e525e..84a527f 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -20,3 +20,12 @@ if (NOT TARGET solanaceae_util) FetchContent_MakeAvailable(solanaceae_util) endif() +if (NOT TARGET solanaceae_object_store) + FetchContent_Declare(solanaceae_object_store + GIT_REPOSITORY https://github.com/Green-Sky/solanaceae_object_store.git + GIT_TAG master + EXCLUDE_FROM_ALL + ) + FetchContent_MakeAvailable(solanaceae_object_store) +endif() + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a33ec73..35202e1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -28,6 +28,7 @@ target_compile_features(solanaceae_message3 PUBLIC cxx_std_17) target_link_libraries(solanaceae_message3 PUBLIC solanaceae_util solanaceae_contact + solanaceae_object_store # for fwd.hpp in components EnTT::EnTT ) diff --git a/src/solanaceae/message3/components.hpp b/src/solanaceae/message3/components.hpp index 394016e..6c54911 100644 --- a/src/solanaceae/message3/components.hpp +++ b/src/solanaceae/message3/components.hpp @@ -4,8 +4,7 @@ #include "./message.hpp" -//fwd -struct File2I; +#include #include @@ -72,6 +71,11 @@ namespace Message::Components { struct TagMessageIsAction {}; + // points to the object providing the file for this message + struct MessageFileObject { + ObjectHandle o; + }; + namespace Transfer { //struct TransferState { diff --git a/src/solanaceae/message3/components_id.inl b/src/solanaceae/message3/components_id.inl index 93c66ee..10d83f6 100644 --- a/src/solanaceae/message3/components_id.inl +++ b/src/solanaceae/message3/components_id.inl @@ -30,6 +30,7 @@ DEFINE_COMP_ID(Message::Components::ReadBy) DEFINE_COMP_ID(Message::Components::SyncedBy) DEFINE_COMP_ID(Message::Components::MessageText) DEFINE_COMP_ID(Message::Components::TagMessageIsAction) +DEFINE_COMP_ID(Message::Components::MessageFileObject) DEFINE_COMP_ID(Message::Components::Transfer::TagHaveAll) DEFINE_COMP_ID(Message::Components::Transfer::BytesSent)