refactor: core-io and core-fmt separate modules added

example/CMakeLists.txt

@@ -30,19 +30,19 @@ function(add_example target)
     target_link_libraries(${target} PRIVATE ${ARGN})
 endfunction()
 
-add_example(avg_speed mp-units::si mp-units::si-cgs mp-units::si-international)
+add_example(avg_speed mp-units::core-io mp-units::si mp-units::si-cgs mp-units::si-international)
-add_example(box_example mp-units::si)
+add_example(box_example mp-units::core-fmt mp-units::si)
-add_example(capacitor_time_curve mp-units::si)
+add_example(capacitor_time_curve mp-units::core-io mp-units::si)
-add_example(clcpp_response mp-units::si mp-units::si-iau mp-units::si-imperial mp-units::si-international mp-units::si-typographic mp-units::si-us)
+add_example(clcpp_response mp-units::core-fmt mp-units::core-io mp-units::si mp-units::si-iau mp-units::si-imperial mp-units::si-international mp-units::si-typographic mp-units::si-us)
-add_example(conversion_factor mp-units::si)
+add_example(conversion_factor mp-units::core-fmt mp-units::core-io mp-units::si)
-add_example(custom_systems mp-units::si)
+add_example(custom_systems mp-units::core-io mp-units::si)
-add_example(experimental_angle mp-units::si)
+add_example(experimental_angle mp-units::core-fmt mp-units::core-io mp-units::si)
-add_example(foot_pound_second mp-units::si-fps)
+add_example(foot_pound_second mp-units::core-fmt mp-units::si-fps)
-add_example(hello_units mp-units::si mp-units::si-international)
+add_example(hello_units mp-units::core-fmt mp-units::core-io mp-units::si mp-units::si-international)
-add_example(kalman_filter-alpha_beta_filter_example2 mp-units::si)
+add_example(kalman_filter-alpha_beta_filter_example2 mp-units::core-fmt mp-units::si)
-add_example(measurement mp-units::si)
+add_example(measurement mp-units::core-io mp-units::si)
-add_example(total_energy mp-units::si mp-units::isq-natural)
+add_example(total_energy mp-units::core-io mp-units::si mp-units::isq-natural)
-add_example(unknown_dimension mp-units::si)
+add_example(unknown_dimension mp-units::core-io mp-units::si)
 
 if(NOT UNITS_LIBCXX)
     add_executable(glide_computer
@@ -50,10 +50,10 @@ if(NOT UNITS_LIBCXX)
         glide_computer.cpp glide_computer.h
         glide_computer_example.cpp
     )
-    target_link_libraries(glide_computer PRIVATE mp-units::si mp-units::si-international)
+    target_link_libraries(glide_computer PRIVATE mp-units::core-fmt mp-units::si mp-units::si-international)
 
     find_package(linear_algebra CONFIG REQUIRED)
-    add_example(linear_algebra mp-units::si)
+    add_example(linear_algebra mp-units::core-fmt mp-units::core-io mp-units::si)
     target_link_libraries(linear_algebra PRIVATE linear_algebra::linear_algebra)
 endif()
 

src/CMakeLists.txt

@@ -28,14 +28,20 @@ project(mp-units
 
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 
+include(AddUnitsModule)
 include(GNUInstallDirs)
+
 add_subdirectory(core)
+add_subdirectory(core-fmt)
+add_subdirectory(core-io)
 add_subdirectory(systems)
 
 # project-wide wrapper
 add_library(mp-units INTERFACE)
 target_link_libraries(mp-units INTERFACE
     mp-units::core
+    mp-units::core-io
+    mp-units::core-fmt
     mp-units::systems
 )
 add_library(mp-units::mp-units ALIAS mp-units)

src/cmake/AddUnitsModule.cmake

@@ -23,9 +23,9 @@
 cmake_minimum_required(VERSION 3.15)
 
 #
-# add_system(SystemName <depependencies>...)
+# add_units_module(ModuleName <depependencies>...)
 #
-function(add_system name)
+function(add_units_module name)
     add_library(mp-units-${name} INTERFACE)
     target_link_libraries(mp-units-${name} INTERFACE ${ARGN})
     target_include_directories(mp-units-${name} INTERFACE

src/core-fmt/CMakeLists.txt

@@ -0,0 +1,28 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2018 Mateusz Pusz
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+cmake_minimum_required(VERSION 3.15)
+
+# find dependencies
+find_package(fmt CONFIG REQUIRED)
+
+add_units_module(core-fmt mp-units::core fmt::fmt)

src/core-io/CMakeLists.txt

@@ -0,0 +1,25 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2018 Mateusz Pusz
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+cmake_minimum_required(VERSION 3.15)
+
+add_units_module(core-io mp-units::core)

src/core/CMakeLists.txt

@@ -27,7 +27,6 @@ set(UNITS_DOWNCAST_MODE ON CACHE STRING "Select downcasting mode")
 set_property(CACHE UNITS_DOWNCAST_MODE PROPERTY STRINGS AUTO ON OFF)
 
 # find dependencies
-find_package(fmt CONFIG REQUIRED)
 find_package(gsl-lite CONFIG REQUIRED)
 
 # check if libc++ is being used
@@ -38,7 +37,6 @@ check_libcxx_in_use(UNITS_LIBCXX)
 add_library(mp-units-core INTERFACE)
 target_compile_features(mp-units-core INTERFACE cxx_std_20)
 target_link_libraries(mp-units-core INTERFACE
-    fmt::fmt
     gsl::gsl-lite
 )
 target_include_directories(mp-units-core INTERFACE

src/systems/CMakeLists.txt

@@ -22,8 +22,6 @@
 
 cmake_minimum_required(VERSION 3.15)
 
-include(AddSystem)
-
 # systems
 add_subdirectory(data)
 add_subdirectory(isq)

src/systems/data/CMakeLists.txt

@@ -22,4 +22,4 @@
 
 cmake_minimum_required(VERSION 3.15)
 
-add_system(data mp-units::core)
+add_units_module(data mp-units::core)

src/systems/isq-natural/CMakeLists.txt

@@ -22,4 +22,4 @@
 
 cmake_minimum_required(VERSION 3.15)
 
-add_system(isq-natural mp-units::isq)
+add_units_module(isq-natural mp-units::isq)

src/systems/isq/CMakeLists.txt

@@ -22,4 +22,4 @@
 
 cmake_minimum_required(VERSION 3.15)
 
-add_system(isq mp-units::core)
+add_units_module(isq mp-units::core)

src/systems/si-cgs/CMakeLists.txt

@@ -22,4 +22,4 @@
 
 cmake_minimum_required(VERSION 3.15)
 
-add_system(si-cgs mp-units::si)
+add_units_module(si-cgs mp-units::si)

src/systems/si-fps/CMakeLists.txt

@@ -22,4 +22,4 @@
 
 cmake_minimum_required(VERSION 3.15)
 
-add_system(si-fps mp-units::si)
+add_units_module(si-fps mp-units::si)

src/systems/si-iau/CMakeLists.txt

@@ -22,4 +22,4 @@
 
 cmake_minimum_required(VERSION 3.15)
 
-add_system(si-iau mp-units::si)
+add_units_module(si-iau mp-units::si)

src/systems/si-imperial/CMakeLists.txt

@@ -22,4 +22,4 @@
 
 cmake_minimum_required(VERSION 3.15)
 
-add_system(si-imperial mp-units::si)
+add_units_module(si-imperial mp-units::si)

src/systems/si-international/CMakeLists.txt

@@ -22,4 +22,4 @@
 
 cmake_minimum_required(VERSION 3.15)
 
-add_system(si-international mp-units::si)
+add_units_module(si-international mp-units::si)

src/systems/si-typographic/CMakeLists.txt

@@ -22,4 +22,4 @@
 
 cmake_minimum_required(VERSION 3.15)
 
-add_system(si-typographic mp-units::si)
+add_units_module(si-typographic mp-units::si)

src/systems/si-us/CMakeLists.txt

@@ -22,4 +22,4 @@
 
 cmake_minimum_required(VERSION 3.15)
 
-add_system(si-us mp-units::si)
+add_units_module(si-us mp-units::si)

src/systems/si/CMakeLists.txt

@@ -22,4 +22,4 @@
 
 cmake_minimum_required(VERSION 3.15)
 
-add_system(si mp-units::isq)
+add_units_module(si mp-units::isq)