diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 7f9926ec..4f001572 100644 --- a/example/CMakeLists.txt +++ b/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(box_example mp-units::si) -add_example(capacitor_time_curve 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(conversion_factor mp-units::si) -add_example(custom_systems mp-units::si) -add_example(experimental_angle mp-units::si) -add_example(foot_pound_second mp-units::si-fps) -add_example(hello_units mp-units::si mp-units::si-international) -add_example(kalman_filter-alpha_beta_filter_example2 mp-units::si) -add_example(measurement mp-units::si) -add_example(total_energy mp-units::si mp-units::isq-natural) -add_example(unknown_dimension mp-units::si) +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::core-fmt mp-units::si) +add_example(capacitor_time_curve mp-units::core-io mp-units::si) +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::core-fmt mp-units::core-io mp-units::si) +add_example(custom_systems mp-units::core-io 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::core-fmt mp-units::si-fps) +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::core-fmt mp-units::si) +add_example(measurement mp-units::core-io mp-units::si) +add_example(total_energy mp-units::core-io mp-units::si mp-units::isq-natural) +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() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f02d4bf1..446c6a1e 100644 --- a/src/CMakeLists.txt +++ b/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) diff --git a/src/cmake/AddSystem.cmake b/src/cmake/AddUnitsModule.cmake similarity index 95% rename from src/cmake/AddSystem.cmake rename to src/cmake/AddUnitsModule.cmake index 75eee0d3..9d51c582 100644 --- a/src/cmake/AddSystem.cmake +++ b/src/cmake/AddUnitsModule.cmake @@ -23,9 +23,9 @@ cmake_minimum_required(VERSION 3.15) # -# add_system(SystemName ...) +# add_units_module(ModuleName ...) # -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 diff --git a/src/core-fmt/CMakeLists.txt b/src/core-fmt/CMakeLists.txt new file mode 100644 index 00000000..49389d5c --- /dev/null +++ b/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) diff --git a/src/core/include/units/format.h b/src/core-fmt/include/units/format.h similarity index 100% rename from src/core/include/units/format.h rename to src/core-fmt/include/units/format.h diff --git a/src/core-io/CMakeLists.txt b/src/core-io/CMakeLists.txt new file mode 100644 index 00000000..dc34d127 --- /dev/null +++ b/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) diff --git a/src/core/include/units/bits/external/fixed_string_io.h b/src/core-io/include/units/bits/external/fixed_string_io.h similarity index 100% rename from src/core/include/units/bits/external/fixed_string_io.h rename to src/core-io/include/units/bits/external/fixed_string_io.h diff --git a/src/core/include/units/quantity_io.h b/src/core-io/include/units/quantity_io.h similarity index 100% rename from src/core/include/units/quantity_io.h rename to src/core-io/include/units/quantity_io.h diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 2b5381b0..75325591 100644 --- a/src/core/CMakeLists.txt +++ b/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 diff --git a/src/systems/CMakeLists.txt b/src/systems/CMakeLists.txt index f532d18f..47521fe7 100644 --- a/src/systems/CMakeLists.txt +++ b/src/systems/CMakeLists.txt @@ -22,8 +22,6 @@ cmake_minimum_required(VERSION 3.15) -include(AddSystem) - # systems add_subdirectory(data) add_subdirectory(isq) diff --git a/src/systems/data/CMakeLists.txt b/src/systems/data/CMakeLists.txt index 5e31bf59..f386ca90 100644 --- a/src/systems/data/CMakeLists.txt +++ b/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) diff --git a/src/systems/isq-natural/CMakeLists.txt b/src/systems/isq-natural/CMakeLists.txt index 684e71da..7f9353b4 100644 --- a/src/systems/isq-natural/CMakeLists.txt +++ b/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) diff --git a/src/systems/isq/CMakeLists.txt b/src/systems/isq/CMakeLists.txt index 2394315d..1c8e49b5 100644 --- a/src/systems/isq/CMakeLists.txt +++ b/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) diff --git a/src/systems/si-cgs/CMakeLists.txt b/src/systems/si-cgs/CMakeLists.txt index a2bb7755..10b16ae9 100644 --- a/src/systems/si-cgs/CMakeLists.txt +++ b/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) diff --git a/src/systems/si-fps/CMakeLists.txt b/src/systems/si-fps/CMakeLists.txt index 16106a5d..c311fb5e 100644 --- a/src/systems/si-fps/CMakeLists.txt +++ b/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) diff --git a/src/systems/si-iau/CMakeLists.txt b/src/systems/si-iau/CMakeLists.txt index ee40346f..ce9984a8 100644 --- a/src/systems/si-iau/CMakeLists.txt +++ b/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) diff --git a/src/systems/si-imperial/CMakeLists.txt b/src/systems/si-imperial/CMakeLists.txt index 477365a1..f99f274b 100644 --- a/src/systems/si-imperial/CMakeLists.txt +++ b/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) diff --git a/src/systems/si-international/CMakeLists.txt b/src/systems/si-international/CMakeLists.txt index 779e97cc..e8b2716a 100644 --- a/src/systems/si-international/CMakeLists.txt +++ b/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) diff --git a/src/systems/si-typographic/CMakeLists.txt b/src/systems/si-typographic/CMakeLists.txt index 96dd63ae..10d0e4d7 100644 --- a/src/systems/si-typographic/CMakeLists.txt +++ b/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) diff --git a/src/systems/si-us/CMakeLists.txt b/src/systems/si-us/CMakeLists.txt index e6a25e6a..69caa8e8 100644 --- a/src/systems/si-us/CMakeLists.txt +++ b/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) diff --git a/src/systems/si/CMakeLists.txt b/src/systems/si/CMakeLists.txt index 7994bd13..bb5098b5 100644 --- a/src/systems/si/CMakeLists.txt +++ b/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)