move to ::crt namespace to prevent future naming collisions

removed types.hpp

got rid of chrono folder

Author: BestITUserEUW

CMakeLists.txt

@@ -1,8 +1,12 @@
 cmake_minimum_required(VERSION 3.24)
 
-project(oryx-crt-cpp VERSION 0.2.0 LANGUAGES CXX)
+include(cmake/utils.cmake)
+
+oryx_extract_version()
+
+project(oryx-crt-cpp VERSION ${ORYX_CRT_VERSION} LANGUAGES CXX)
 
-message(STATUS "Build oryx-crt-cpp: ${PROJECT_VERSION}")
+message(STATUS "Build ${PROJECT_NAME}: ${PROJECT_VERSION}")
 
 include(cmake/utils.cmake)
 
@@ -60,8 +64,7 @@ file(GLOB_RECURSE ORYX_CRT_HEADERS
 )
 
 target_sources(${PROJECT_NAME} 
-    PRIVATE 
-        src/frame_rate_controller.cpp
+    PRIVATE
         src/uuid.cpp
     PUBLIC
         FILE_SET HEADERS

README.md

@@ -1,11 +1,9 @@
 # oryx-crt-cpp
 
-Common C++ Runtime used for personal C++ Projects. Happy to accept any contributions and improvements to this library
+Common C++ Runtime used for personal C++ Projects.
 
 ## Third Party libraries
 
-Even tho my libary is licensened with the UNLICENSE make sure to check third party licences of the libs included in this library, when using this lib in your project.
-
 - [httplib](https://github.com/yhirose/cpp-httplib) MIT license
 - [thread_pool](https://github.com/bshoshany/thread-pool.git) MIT license
 - [enchantum](https://github.com/ZXShady/enchantum.git) MIT license

cmake/utils.cmake

@@ -1,3 +1,34 @@
+function(_internal_extract_version_fail_message tag)
+    message(FATAL_ERROR "Could not extract ${tag} version number from chron/version.hpp")
+endfunction()
+
+function(oryx_extract_version)
+    file(READ "${CMAKE_CURRENT_LIST_DIR}/include/oryx/crt/version.hpp" file_contents)
+
+    string(REGEX MATCH "kVersionMajor[ \t]*=[ \t]*([0-9]+)" _ "${file_contents}")
+    if(NOT CMAKE_MATCH_COUNT EQUAL 1)
+        _internal_extract_version_fail_message(major)
+    endif()
+    set(ver_major ${CMAKE_MATCH_1})
+
+    string(REGEX MATCH "KVersionMinor[ \t]*=[ \t]*([0-9]+)" _ "${file_contents}")
+    if(NOT CMAKE_MATCH_COUNT EQUAL 1)
+        _internal_extract_version_fail_message(minor)
+    endif()
+
+    set(ver_minor ${CMAKE_MATCH_1})
+    string(REGEX MATCH "kVersionPatch[ \t]*=[ \t]*([0-9]+)" _ "${file_contents}")
+    if(NOT CMAKE_MATCH_COUNT EQUAL 1)
+        _internal_extract_version_fail_message(patch)
+    endif()
+    set(ver_patch ${CMAKE_MATCH_1})
+
+    set(ORYX_CRT_VERSION_MAJOR ${ver_major} PARENT_SCOPE)
+    set(ORYX_CRT_VERSION_MINOR ${ver_minor} PARENT_SCOPE)
+    set(ORYX_CRT_VERSION_PATCH ${ver_patch} PARENT_SCOPE)
+    set(ORYX_CRT_VERSION "${ver_major}.${ver_minor}.${ver_patch}" PARENT_SCOPE)
+endfunction()
+
 function(oryx_enable_addr_sanitizer target_name)
     if(NOT CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
         message(FATAL_ERROR "Sanitizer supported only for gcc/clang!")

include/oryx/chrono/now.hpp

@@ -7,15 +7,16 @@
 
 #include "from_chars.hpp"
 
-namespace oryx::argparse {
+namespace oryx::crt {
+
 namespace details {
 template <typename>
 constexpr bool always_false = false;
 }
 
-class CLI {
+class ArgumentParser {
 public:
-    CLI(int argc, const char* const* argv)
+    ArgumentParser(int argc, const char* const* argv)
         : view_(argv, argc) {}
 
     auto Contains(std::string_view option) const { return std::ranges::find(view_, option) != view_.end(); }
@@ -59,4 +60,4 @@ class CLI {
     std::basic_string_view<const char*> view_;
 };
 
-}  // namespace oryx::argparse
+}  // namespace oryx::crt

include/oryx/argparse.hpp include/oryx/crt/argparse.hppinclude/oryx/argparse.hpp renamed to include/oryx/crt/argparse.hpp

@@ -7,7 +7,7 @@
 
 #include "synchronized.hpp"
 
-namespace oryx {
+namespace oryx::crt {
 
 /**
  * @brief CallbackList is a thread safe list that stores callbacks, and can notify these callbacks.
@@ -92,4 +92,4 @@ class CallbackList {
     Synchronized<std::vector<Subscriber>> subs_{};
 };
 
-}  // namespace oryx
+}  // namespace oryx::crt

include/oryx/callback_list.hpp include/oryx/crt/callback_list.hppinclude/oryx/callback_list.hpp renamed to include/oryx/crt/callback_list.hpp

@@ -3,10 +3,10 @@
 #include <chrono>
 #include <optional>
 
-#include <oryx/scope_exit.hpp>
-#include <oryx/chrono/stopwatch.hpp>
+#include "scope_exit.hpp"
+#include "stopwatch.hpp"
 
-namespace oryx::chrono {
+namespace oryx::crt {
 
 template <class Clock = std::chrono::steady_clock>
     requires std::chrono::is_clock_v<Clock>
@@ -45,4 +45,4 @@ auto MakeFrameRateTimer(int target_fps) {
     return CycleTimer<Clock>{typename CycleTimer<Clock>::Duration{1000 / target_fps}};
 }
 
-}  // namespace oryx::chrono
+}  // namespace oryx::crt

include/oryx/chrono/cycle_timer.hpp include/oryx/crt/cycle_timer.hppinclude/oryx/chrono/cycle_timer.hpp renamed to include/oryx/crt/cycle_timer.hpp

@@ -3,7 +3,7 @@
 #include <string>
 #include <string_view>
 
-namespace oryx {
+namespace oryx::crt {
 
 /**
  * @brief Base error class for exception free programming
@@ -19,4 +19,4 @@ class Error {
     std::string what_;
 };
 
-}  // namespace oryx
+}  // namespace oryx::crt