Some cmake fixes

- third_party back to previous version
- updated readme and added components info

Author: MAIPA01

README.md

@@ -2,16 +2,19 @@
 
 ## About
 
-**mstd** (Maipa's Standard Library) is an extension of the C++ standard library, providing additional utility functions, new data types, and helpful templates for type comparisons. It aims to enhance the standard functionality with useful features while maintaining compatibility with modern C++. [DOCS](https://maipa01.github.io/mstd/html "Documentation")
+**mstd** (Maipa's Standard Library) is an extension of the C++ standard library, providing additional utility functions,
+new data types, and helpful templates for type comparisons. It aims to enhance the standard functionality with useful
+features while maintaining compatibility with modern C++. [DOCS](https://maipa01.github.io/mstd/html "Documentation")
 
 ## Requirements
 
-- **C++ Standard**: The library is designed for **C++20** and later.
+- **C++ Standard**: The library is designed for **C++17** and later.
 - **Supported Platforms**: The library is intended to work on **Windows, macOS, and Linux**.
 
-
 ## Options
+
 ### Compilation defines options
+
 You can enable option using `#define option_name` or use cmake `set(option_name ON CACHE BOOL)`
 
 | Cmake option/C++ define Name     | Description                                                  | Default |
@@ -24,13 +27,15 @@ You can enable option using `#define option_name` or use cmake `set(option_name
 | `MSTD_ENABLE_EXTRA_MACROS`       | enables external macros                                      |   OFF   |
 
 ### External libraries options
+
 If you want to use external libraries not installed by project using CPM
 
 | Cmake option Name   | Description                                                                           | Default |
 |:--------------------|:--------------------------------------------------------------------------------------|:-------:|
 | `MSTD_FMT_EXTERNAL` | Enable if you want to use own fmt library (tested and compatible fmt version: 12.1.0) |   OFF   |
 
 ### Project developing options
+
 These options are used while testing or changing code in project
 
 | Cmake option Name          | Description                                        |          Default          |
@@ -47,45 +52,67 @@ These options are used while testing or changing code in project
 - **Extended String Manipulation**: Additional functions for modifying and handling strings.
 - **Terminal Utilities**: Functions for clearing the terminal and retrieving its dimensions.
 - **New Data Structures**:
-  - `ordered_map`: A map that preserves the insertion order, similar to `vector`.
-  - `ordered_set`: A set that maintains insertion order, like `vector`.
-  - `stable_vector`: A vector with stable indexes
+    - `ordered_map`: A map that preserves the insertion order, similar to `vector`.
+    - `ordered_set`: A set that maintains insertion order, like `vector`.
+    - `stable_vector`: A vector with stable indexes
 - **Safe Arithmetic Operations**: Functions for performing arithmetic with overflow detection:
-  - `add_overflow`
-  - `sub_overflow`
-  - `mul_overflow`
-  - `div_overflow`
-- **Type Comparisons for Functions**: Templates that allow comparing function types, treating lambdas and function pointers as equivalent when they share the same signature.
-- **Managment Utilities**:
-  - `flags`: A class which represents multiple values of given flag-like enum
-  - `id_manager`: Manager which helps with managing ids
-  - `assert`: Macros for easy defining your own assert
+    - `add_overflow`
+    - `sub_overflow`
+    - `mul_overflow`
+    - `div_overflow`
+- **Type Comparisons for Functions**: Templates that allow comparing function types, treating lambdas and function
+  pointers as equivalent when they share the same signature.
+- **Management Utilities**:
+    - `flags`: A class which represents multiple values of given flag-like enum
+    - `id_manager`: Manager which helps with managing ids
+    - `assert`: Macros for easy defining your own assert
 - **Events**:
-  - `events_handler`: Event handler
+    - `events_handler`: Event handler
+
+## Installation
+
+After installing, you can use `find_package(mstd)`.
+
+### Components
+
+You can also include components `find_pcakage(mstd COMPONENTS comp)`. They work the same way as [Compilation defines options](#compilation-defines-options), but
+they provide separate components you need to include.
+
+| Component Name       | Option                           | Target Name                |
+|:---------------------|:---------------------------------|:---------------------------|
+| CXX20                | `MSTD_ENABLE_CXX20`              | mstd::CXX20                |
+| NO_ASSERT_ON_RELEASE | `MSTD_DISABLE_ASSERT_ON_RELEASE` | mstd::NO_ASSERT_ON_RELEASE |
+| FOR_EACH_MACROS      | `MSTD_ENABLE_FOR_EACH_MACROS`    | mstd::FOR_EACH_MACROS      |
+| ENUMS_MACROS         | `MSTD_ENABLE_ENUMS_MACROS`       | mstd::ENUMS_MACROS         |
+| CLONE_FUNC_MACROS    | `MSTD_ENABLE_CLONE_FUNC_MACROS`  | mstd::CLONE_FUNC_MACROS    |
+| EXTRA_MACROS         | `MSTD_ENABLE_EXTRA_MACROS`       | mstd::EXTRA_MACROS         |
 
 ## Macros
 
-Before including the `mstd.hpp` or `macros.hpp` header, you can define certain macros to enable specific sets of utility functions and features within the library.
+Before including the `mstd.hpp` or `macros.hpp` header, you can define certain macros to enable specific sets of utility
+functions and features within the library.
 
 ### Available Macros:
 
-- **USE_FOR_EACH_MACROS**: This macro enables access to the `DO_FOR_EACH` macro, which allows you to iterate over multiple elements and apply a function to each element.
+- **MSTD_ENABLE_FOR_EACH_MACROS**: This macro enables access to the `DO_FOR_EACH` macro, which allows you to iterate over
+  multiple elements and apply a function to each element.
 
   Example usage:
   ```cpp
-  #define USE_FOR_EACH_MACROS
+  #define MSTD_ENABLE_FOR_EACH_MACROS
   #include <mstd/mstd.hpp>
 
   #define TO_STR(x) #x
   // Example of DO_FOR_EACH with TO_STR macro
   DO_FOR_EACH(TO_STR, 1, 2, 3); // Outputs: "1" "2" "3"
   ```
 
-- **USE_ENUMS_MACROS**: This macro enables access to the `ENUM` macro, which allows you to define enums or enum classes along with helper functions such as `to_string()` and `size<Enum>()`.
+- **MSTD_ENABLE_ENUMS_MACROS**: This macro enables access to the `ENUM` macro, which allows you to define enums or enum classes
+  along with helper functions such as `to_string()` and `size<Enum>()`.
 
   Example usage:
   ```cpp
-  #define USE_ENUMS_MACROS
+  #define MSTD_ENABLE_ENUMS_MACROS
   #include <mstd/mstd.hpp>
 
   // Defining an enum using ENUM macro
@@ -96,11 +123,13 @@ Before including the `mstd.hpp` or `macros.hpp` header, you can define certain m
   std::cout << size<Color>() << std::endl; // Outputs: 3 (the number of elements in the enum)
   ```
 
-- **USE_CLONE_FUNC_MACROS**: This macro enables access to macros that help you define basic cloning functions like `Clone()` and `CloneTo()` for your custom classes. Specifically, it uses the `CloneFuncInClassDefinition` macro to automatically generate the `Clone()` function that returns a pointer to a cloned object.
+- **MSTD_ENABLE_CLONE_FUNC_MACROS**: This macro enables access to macros that help you define basic cloning functions like
+  `Clone()` and `CloneTo()` for your custom classes. Specifically, it uses the `CloneFuncInClassDefinition` macro to
+  automatically generate the `Clone()` function that returns a pointer to a cloned object.
 
   Example usage:
   ```cpp
-  #define USE_CLONE_FUNC_MACROS
+  #define MSTD_ENABLE_CLONE_FUNC_MACROS
   #include <mstd/mstd.hpp>
 
   // Example of a class with Clone() function returning a pointer using CloneFuncInClassDefinition macro
@@ -121,9 +150,9 @@ Before including the `mstd.hpp` or `macros.hpp` header, you can define certain m
 To enable these macros, define them before including `mstd.hpp`:
 
 ```cpp
-#define USE_FOR_EACH_MACROS
-#define USE_ENUMS_MACROS
-#define USE_CLONE_FUNC_MACROS
+#define MSTD_ENABLE_FOR_EACH_MACROS
+#define MSTD_ENABLE_ENUMS_MACROS
+#define MSTD_ENABLE_CLONE_FUNC_MACROS
 #include <mstd/mstd.hpp>
 ```
 
@@ -192,4 +221,5 @@ int main() {
 
 ## License
 
-This project is licensed under the **BSD 3-Clause License with Attribution Requirement**. See the [`LICENSE`](./LICENSE) file for more details.
+This project is licensed under the **BSD 3-Clause License with Attribution Requirement**. See the [LICENSE](./LICENSE "License")
+file for more details.

cmake/get_cpm.cmake

@@ -1,9 +1,13 @@
 set(CPM_USE_LOCAL_PACKAGES OFF)
 # Storage location
-set(CPM_SOURCE_CACHE ${CMAKE_CURRENT_SOURCE_DIR}/third_party)
+if(NOT CPM_SOURCE_CACHE)
+    set(CPM_SOURCE_CACHE ${CMAKE_SOURCE_DIR}/third_party)
+endif()
 
 # Set download location
-set(CPM_DOWNLOAD_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/third_party/cpm/CPM.cmake")
+if(NOT CPM_DOWNLOAD_LOCATION)
+    set(CPM_DOWNLOAD_LOCATION "${CMAKE_SOURCE_DIR}/third_party/cpm/CPM.cmake")
+endif()
 
 # download CPM.cmake
 # Expand relative path. This is important if the provided path contains a tilde (~)

cmake/mstdConfig.cmake.in

@@ -12,7 +12,9 @@ endif()
 set_and_check(@PROJECT_NAME@_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
 set(@PROJECT_NAME@_PCH_PATH "${@PROJECT_NAME@_INCLUDE_DIR}/@PROJECT_NAME@/pch.hpp")
 
-include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake)
+if(NOT TARGET @PROJECT_NAMESPACE@@PROJECT_NAME@)
+    include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake)
+endif()
 
 set(@PROJECT_NAME@_components CXX20 NO_ASSERT_ON_RELEASE FOR_EACH_MACROS ENUMS_MACROS CLONE_FUNC_MACROS EXTRA_MACROS)
 

cmake/third_party.cmake

@@ -1,13 +1,25 @@
-if(NOT MSTD_FMT_EXTERNAL OR MSTD_BUILD_TESTS OR MSTD_BUILD_COVERAGE)
+if(NOT MSTD_FMT_EXTERNAL AND NOT TARGET fmt::fmt)
+    set(DOWNLOAD_FMT ON)
+else()
+    set(DOWNLOAD_FMT OFF)
+endif()
+
+if ((MSTD_BUILD_TESTS OR MSTD_BUILD_COVERAGE) AND NOT TARGET gtest_main)
+    set(DOWNLOAD_GTEST ON)
+else()
+    set(DOWNLOAD_GTEST OFF)
+endif()
+
+if(DOWNLOAD_FMT OR DOWNLOAD_GTEST)
     include(${CMAKE_CURRENT_LIST_DIR}/get_cpm.cmake)
 endif()
 
 # FMT
-if(NOT MSTD_FMT_EXTERNAL)
+if(DOWNLOAD_FMT)
     CPMAddPackage("gh:fmtlib/fmt#12.1.0")
 endif()
 
 # GOOGLE TESTS
-if(MSTD_BUILD_TESTS OR MSTD_BUILD_COVERAGE)
+if(DOWNLOAD_GTEST)
     CPMAddPackage("gh:google/googletest#v1.17.0")
 endif()

mstd/CMakeLists.txt

@@ -44,9 +44,7 @@ target_precompile_headers(${PROJECT_NAME} INTERFACE "$<BUILD_INTERFACE:${BUILD_H
                                                     "$<INSTALL_INTERFACE:${${PROJECT_NAME}_PCH_PATH}>"
 )
 
-target_compile_features(${PROJECT_NAME} INTERFACE   $<BUILD_INTERFACE:$<IF:$<BOOL:${MSTD_ENABLE_CXX20}>, cxx_std_20, cxx_std_17>>
-                                                    $<INSTALL_INTERFACE:cxx_std_17>
-)
+target_compile_features(${PROJECT_NAME} INTERFACE   $<BUILD_INTERFACE:$<IF:$<BOOL:${MSTD_ENABLE_CXX20}>, cxx_std_20, cxx_std_17>>)
 
 # region LINK_LIBRARIES
 if(NOT TARGET ${PROJECT_NAMESPACE}fmt_imported)
@@ -59,7 +57,9 @@ target_link_libraries(${PROJECT_NAME} INTERFACE $<BUILD_INTERFACE:fmt::fmt>
 # endregion
 
 # set headers folder
-target_include_directories(${PROJECT_NAME} INTERFACE "$<BUILD_INTERFACE:${BUILD_HEADERS_PATHS}>")
+target_include_directories(${PROJECT_NAME} SYSTEM INTERFACE "$<BUILD_INTERFACE:${BUILD_HEADERS_PATHS}>"
+                                                            $<INSTALL_INTERFACE:${INSTALL_HEADERS_PATH}>
+)
 
 # region COMPILE_DEFINITIONS
 target_compile_definitions(${PROJECT_NAME} INTERFACE	$<BUILD_INTERFACE:

mstd/include/main/mstd/config.hpp

@@ -28,7 +28,7 @@
 	#pragma endregion
 
 	#pragma region LAST_UPDATE
-	#define MSTD_LAST_UPDATE_DAY   15
+	#define MSTD_LAST_UPDATE_DAY   16
 	#define MSTD_LAST_UPDATE_MONTH 04
 	#define MSTD_LAST_UPDATE_YEAR  2026