restructure and manage own deps

CMakeLists.txt

@@ -1,34 +1,66 @@
-cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.24 FATAL_ERROR)
 
-project(solanaceae)
+# cmake setup begin
+project(solanaceae_message3)
 
-add_library(solanaceae_message3
+if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
-	./solanaceae/message3/file.hpp
+	set(SOLANACEAE_MESSAGE3_STANDALONE ON)
-	./solanaceae/message3/file_r_mem.hpp
+else()
-	./solanaceae/message3/file_r_file.hpp
+	set(SOLANACEAE_MESSAGE3_STANDALONE OFF)
-	./solanaceae/message3/file_w_file.hpp
+endif()
-	./solanaceae/message3/file_rw_file.hpp
+message("II SOLANACEAE_MESSAGE3_STANDALONE " ${SOLANACEAE_MESSAGE3_STANDALONE})
 
-	./solanaceae/message3/components.hpp
+if (SOLANACEAE_MESSAGE3_STANDALONE)
-	./solanaceae/message3/components_id.inl
+	set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-	./solanaceae/message3/message_model3.hpp
+	# defaulting to debug mode, if not specified
+	if(NOT CMAKE_BUILD_TYPE)
+		set(CMAKE_BUILD_TYPE "Debug")
+	endif()
 
-	./solanaceae/message3/registry_message_model.hpp
+	# setup my vim ycm :D
-	./solanaceae/message3/registry_message_model.cpp
+	set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-	./solanaceae/message3/message_time_sort.hpp
+	# more paths
-	./solanaceae/message3/message_time_sort.cpp
+	set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
+	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+endif()
 
-	./solanaceae/message3/message_command_dispatcher.hpp
+# external libs
-	./solanaceae/message3/message_command_dispatcher.cpp
+add_subdirectory(./external EXCLUDE_FROM_ALL) # before increasing warn levels, sad :(
-)
 
-target_include_directories(solanaceae_message3 PUBLIC .)
+if (SOLANACEAE_MESSAGE3_STANDALONE)
-target_compile_features(solanaceae_message3 PUBLIC cxx_std_17)
+	set(CMAKE_CXX_EXTENSIONS OFF)
-target_link_libraries(solanaceae_message3 PUBLIC
+
-	solanaceae_util
+	# bump up warning levels appropriately for clang, gcc & msvc
-	solanaceae_contact
+	if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
-	EnTT::EnTT
+		add_compile_options(
-)
+			-Wall -Wextra # Reasonable and standard
+			-Wpedantic # Warn if non-standard C++ is used
+			-Wunused # Warn on anything being unused
+			#-Wconversion # Warn on type conversions that may lose data
+			#-Wsign-conversion # Warn on sign conversions
+			-Wshadow # Warn if a variable declaration shadows one from a parent context
+		)
+
+		if (NOT WIN32)
+			#link_libraries(-fsanitize=address)
+			#link_libraries(-fsanitize=address,undefined)
+			#link_libraries(-fsanitize-address-use-after-scope)
+			#link_libraries(-fsanitize=undefined)
+		endif()
+	elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
+		if (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
+			string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+		else()
+			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
+		endif()
+	endif()
+
+endif()
+
+# cmake setup end
+
+add_subdirectory(./src)
 

external/CMakeLists.txt

@@ -0,0 +1,22 @@
+cmake_minimum_required(VERSION 3.24 FATAL_ERROR)
+
+include(FetchContent)
+
+if (NOT TARGET solanaceae_contact)
+	FetchContent_Declare(solanaceae_contact
+		GIT_REPOSITORY https://github.com/Green-Sky/solanaceae_contact.git
+		GIT_TAG master
+		EXCLUDE_FROM_ALL
+	)
+	FetchContent_MakeAvailable(solanaceae_contact)
+endif()
+
+if (NOT TARGET solanaceae_util)
+	FetchContent_Declare(solanaceae_util
+		GIT_REPOSITORY https://github.com/Green-Sky/solanaceae_util.git
+		GIT_TAG master
+		EXCLUDE_FROM_ALL
+	)
+	FetchContent_MakeAvailable(solanaceae_util)
+endif()
+

src/CMakeLists.txt

@@ -0,0 +1,30 @@
+add_library(solanaceae_message3
+	./solanaceae/message3/file.hpp
+	./solanaceae/message3/file_r_mem.hpp
+	./solanaceae/message3/file_r_file.hpp
+	./solanaceae/message3/file_w_file.hpp
+	./solanaceae/message3/file_rw_file.hpp
+
+	./solanaceae/message3/components.hpp
+	./solanaceae/message3/components_id.inl
+
+	./solanaceae/message3/message_model3.hpp
+
+	./solanaceae/message3/registry_message_model.hpp
+	./solanaceae/message3/registry_message_model.cpp
+
+	./solanaceae/message3/message_time_sort.hpp
+	./solanaceae/message3/message_time_sort.cpp
+
+	./solanaceae/message3/message_command_dispatcher.hpp
+	./solanaceae/message3/message_command_dispatcher.cpp
+)
+
+target_include_directories(solanaceae_message3 PUBLIC .)
+target_compile_features(solanaceae_message3 PUBLIC cxx_std_17)
+target_link_libraries(solanaceae_message3 PUBLIC
+	solanaceae_util
+	solanaceae_contact
+	EnTT::EnTT
+)
+

src/solanaceae/message3/message_command_dispatcher.cpp

@@ -41,14 +41,18 @@ MessageCommandDispatcher::MessageCommandDispatcher(
 MessageCommandDispatcher::~MessageCommandDispatcher(void) {
 }
 
-void MessageCommandDispatcher::iterate(float) {
+float MessageCommandDispatcher::iterate(float) {
 	if (!_message_queue.empty()) {
 		_rmm.sendText(
 			_message_queue.front().to,
 			_message_queue.front().message
 		);
 		_message_queue.pop_front();
+
+		return 0.05f;
 	}
+
+	return 1.f*60.f*60.f; // 1h
 }
 
 static std::string_view get_first_word(std::string_view text, std::string_view::size_type& out_next) {

src/solanaceae/message3/message_command_dispatcher.hpp

@@ -59,7 +59,7 @@ class MessageCommandDispatcher : public RegistryMessageModelEventI {
 		MessageCommandDispatcher(Contact3Registry& cr, RegistryMessageModel& rmm, ConfigModelI& conf);
 		~MessageCommandDispatcher(void);
 
-		void iterate(float time_delta);
+		float iterate(float time_delta);
 
 		// TODO: think more about permissions?
 		//  - user(s)