feat: add module mp_units

mpusz · Sep 1, 2023 · 6d7d829 · 6d7d829
1 parent fa38e4f
commit 6d7d829
Show file tree

Hide file tree

Showing 73 changed files with 503 additions and 101 deletions.
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
@@ -31,6 +31,10 @@ target_include_directories(example_utils INTERFACE include)
 function(add_example target)
     add_executable(${target} ${target}.cpp)
     target_link_libraries(${target} PRIVATE ${ARGN})
+    if(TARGET mp-units::modules)
+        target_link_libraries(${target} PRIVATE mp-units::modules)
+        target_compile_definitions(${target} PRIVATE MP_UNITS_MODULES)
+    endif()
 endfunction()
 
 add_example(avg_speed mp-units::core-io mp-units::si mp-units::cgs mp-units::usc)

diff --git a/example/avg_speed.cpp b/example/avg_speed.cpp
@@ -20,13 +20,17 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#include <exception>
+#include <iostream>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/ostream.h>
 #include <mp-units/systems/cgs/cgs.h>
 #include <mp-units/systems/international/international.h>
 #include <mp-units/systems/isq/space_and_time.h>
 #include <mp-units/systems/si/unit_symbols.h>
-#include <exception>
-#include <iostream>
+#endif
 
 namespace {
 

diff --git a/example/capacitor_time_curve.cpp b/example/capacitor_time_curve.cpp
@@ -20,11 +20,15 @@
     physical_quantities
 */
 
+#include <iostream>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/math.h>  // IWYU pragma: keep
 #include <mp-units/ostream.h>
 #include <mp-units/systems/isq/electromagnetism.h>
 #include <mp-units/systems/si/si.h>
-#include <iostream>
+#endif
 
 int main()
 {

diff --git a/example/clcpp_response.cpp b/example/clcpp_response.cpp
@@ -15,6 +15,11 @@
  along with this program. If not, see http://www.gnu.org/licenses./
 */
 
+#include <mp-units/bits/fmt_hacks.h>
+#include <iostream>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/format.h>
 #include <mp-units/ostream.h>
 #include <mp-units/systems/iau/iau.h>
@@ -24,7 +29,7 @@
 #include <mp-units/systems/si/si.h>
 #include <mp-units/systems/typographic/typographic.h>
 #include <mp-units/systems/usc/usc.h>
-#include <iostream>
+#endif
 
 namespace {
 

diff --git a/example/conversion_factor.cpp b/example/conversion_factor.cpp
@@ -15,12 +15,17 @@
  along with this program. If not, see http://www.gnu.org/licenses./
 */
 
+#include <mp-units/bits/fmt_hacks.h>
+#include <iostream>
+#include <type_traits>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/format.h>
 #include <mp-units/systems/isq/space_and_time.h>
 #include <mp-units/systems/si/unit_symbols.h>
 #include <mp-units/systems/si/units.h>
-#include <iostream>
-#include <type_traits>
+#endif
 
 /*
   get conversion factor from one dimensionally equivalent

diff --git a/example/currency.cpp b/example/currency.cpp
@@ -20,11 +20,16 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#include <mp-units/quantity_spec_macro.h>
+#include <iostream>
+#include <map>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/ostream.h>
 #include <mp-units/quantity.h>
 #include <mp-units/quantity_point.h>
-#include <iostream>
-#include <map>
+#endif
 
 using namespace mp_units;
 

diff --git a/example/foot_pound_second.cpp b/example/foot_pound_second.cpp
@@ -20,14 +20,19 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#include <mp-units/bits/fmt_hacks.h>
+#include <iostream>
+#include <string_view>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/format.h>
 #include <mp-units/systems/imperial/imperial.h>
 #include <mp-units/systems/international/international.h>
 #include <mp-units/systems/isq/mechanics.h>
 #include <mp-units/systems/isq/space_and_time.h>
 #include <mp-units/systems/si/unit_symbols.h>
-#include <iostream>
-#include <string_view>
+#endif
 
 using namespace mp_units;
 using namespace mp_units::international::unit_symbols;

diff --git a/example/glide_computer_lib/CMakeLists.txt b/example/glide_computer_lib/CMakeLists.txt
@@ -25,3 +25,7 @@ cmake_minimum_required(VERSION 3.2)
 add_library(glide_computer_lib STATIC glide_computer_lib.cpp include/glide_computer_lib.h)
 target_link_libraries(glide_computer_lib PRIVATE mp-units::core-fmt PUBLIC mp-units::si mp-units::utility example_utils)
 target_include_directories(glide_computer_lib PUBLIC include)
+if(TARGET mp-units::modules)
+    target_link_libraries(glide_computer_lib PRIVATE mp-units::modules)
+    target_compile_definitions(glide_computer_lib PRIVATE MP_UNITS_MODULES)
+endif()
diff --git a/example/glide_computer_lib/glide_computer_lib.cpp b/example/glide_computer_lib/glide_computer_lib.cpp
@@ -21,10 +21,14 @@
 // SOFTWARE.
 
 #include "glide_computer_lib.h"
-#include <mp-units/format.h>
 #include <iostream>
 #include <numeric>
 #include <string_view>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
+#include <mp-units/format.h>
+#endif
 
 namespace glide_computer {
 

diff --git a/example/glide_computer_lib/include/glide_computer_lib.h b/example/glide_computer_lib/include/glide_computer_lib.h
@@ -22,11 +22,9 @@
 
 #pragma once
 
+#include <mp-units/quantity_spec_macro.h>
+//
 #include "geographic.h"
-#include <mp-units/chrono.h>
-#include <mp-units/math.h>  // IWYU pragma: keep
-#include <mp-units/quantity_point.h>
-#include <mp-units/systems/isq/space_and_time.h>
 #include <algorithm>
 #include <array>
 #include <initializer_list>
@@ -35,6 +33,14 @@
 #include <ranges>
 #include <string>  // IWYU pragma: keep
 #include <vector>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
+#include <mp-units/chrono.h>
+#include <mp-units/math.h>  // IWYU pragma: keep
+#include <mp-units/quantity_point.h>
+#include <mp-units/systems/isq/space_and_time.h>
+#endif
 
 // An example of a really simplified tactical glide computer
 // Simplifications:

diff --git a/example/hello_units.cpp b/example/hello_units.cpp
@@ -25,12 +25,17 @@
 // !!! renders correctly in the documentation "Examples" section.                 !!!
 // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
+#include <mp-units/bits/fmt_hacks.h>
+#include <iostream>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/format.h>
 #include <mp-units/ostream.h>
 #include <mp-units/systems/international/international.h>
 #include <mp-units/systems/isq/isq.h>
 #include <mp-units/systems/si/si.h>
-#include <iostream>
+#endif
 
 using namespace mp_units;
 

diff --git a/example/include/geographic.h b/example/include/geographic.h
@@ -24,16 +24,20 @@
 
 #include "ranged_representation.h"
 #include <mp-units/bits/fmt_hacks.h>
+#include <compare>
+#include <limits>
+#include <numbers>
+#include <ostream>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/format.h>
 #include <mp-units/math.h>
 #include <mp-units/quantity.h>
 #include <mp-units/quantity_point.h>
 #include <mp-units/systems/isq/space_and_time.h>
 #include <mp-units/systems/si/units.h>
-#include <compare>
-#include <limits>
-#include <numbers>
-#include <ostream>
+#endif
 
 namespace geographic {
 

diff --git a/example/include/ranged_representation.h b/example/include/ranged_representation.h
@@ -24,10 +24,14 @@
 
 #include "validated_type.h"
 #include <mp-units/bits/external/hacks.h>
-#include <mp-units/customization_points.h>
 #include <algorithm>
 #include <concepts>
 #include <type_traits>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
+#include <mp-units/customization_points.h>
+#endif
 
 template<std::movable T, MP_UNITS_CONSTRAINED_NTTP_WORKAROUND(std::convertible_to<T>) auto Min,
          MP_UNITS_CONSTRAINED_NTTP_WORKAROUND(std::convertible_to<T>) auto Max>

diff --git a/example/kalman_filter/CMakeLists.txt b/example/kalman_filter/CMakeLists.txt
@@ -28,6 +28,10 @@ cmake_minimum_required(VERSION 3.2)
 function(add_example target)
     add_executable(${target} ${target}.cpp)
     target_link_libraries(${target} PRIVATE ${ARGN})
+    if(TARGET mp-units::modules)
+        target_link_libraries(${target} PRIVATE mp-units::modules)
+        target_compile_definitions(${target} PRIVATE MP_UNITS_MODULES)
+    endif()
 endfunction()
 
 add_example(kalman_filter-example_1 mp-units::core-fmt mp-units::si mp-units::utility)

diff --git a/example/kalman_filter/kalman.h b/example/kalman_filter/kalman.h
@@ -23,12 +23,16 @@
 #pragma once
 
 #include <mp-units/bits/fmt_hacks.h>
+#include <tuple>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/format.h>
 #include <mp-units/math.h>
 #include <mp-units/quantity.h>
 #include <mp-units/quantity_point.h>
 #include <mp-units/systems/isq/space_and_time.h>
-#include <tuple>
+#endif
 
 namespace kalman {
 

diff --git a/example/kalman_filter/kalman_filter-example_1.cpp b/example/kalman_filter/kalman_filter-example_1.cpp
@@ -21,11 +21,15 @@
 // SOFTWARE.
 
 #include "kalman.h"
+#include <array>
+#include <iostream>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/format.h>
 #include <mp-units/systems/isq/space_and_time.h>
 #include <mp-units/systems/si/unit_symbols.h>
-#include <array>
-#include <iostream>
+#endif
 
 // Based on: https://www.kalmanfilter.net/alphabeta.html#ex1
 

diff --git a/example/kalman_filter/kalman_filter-example_2.cpp b/example/kalman_filter/kalman_filter-example_2.cpp
@@ -21,11 +21,15 @@
 // SOFTWARE.
 
 #include "kalman.h"
+#include <array>
+#include <iostream>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/format.h>
 #include <mp-units/systems/isq/space_and_time.h>
 #include <mp-units/systems/si/unit_symbols.h>
-#include <array>
-#include <iostream>
+#endif
 
 // Based on: https://www.kalmanfilter.net/alphabeta.html#ex2
 

diff --git a/example/kalman_filter/kalman_filter-example_3.cpp b/example/kalman_filter/kalman_filter-example_3.cpp
@@ -21,11 +21,15 @@
 // SOFTWARE.
 
 #include "kalman.h"
+#include <array>
+#include <iostream>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/format.h>
 #include <mp-units/systems/isq/space_and_time.h>
 #include <mp-units/systems/si/unit_symbols.h>
-#include <array>
-#include <iostream>
+#endif
 
 // Based on: https://www.kalmanfilter.net/alphabeta.html#ex3
 

diff --git a/example/kalman_filter/kalman_filter-example_4.cpp b/example/kalman_filter/kalman_filter-example_4.cpp
@@ -21,11 +21,15 @@
 // SOFTWARE.
 
 #include "kalman.h"
+#include <array>
+#include <iostream>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/format.h>
 #include <mp-units/systems/isq/space_and_time.h>
 #include <mp-units/systems/si/unit_symbols.h>
-#include <array>
-#include <iostream>
+#endif
 
 // Based on: https://www.kalmanfilter.net/alphabeta.html#ex4
 

diff --git a/example/kalman_filter/kalman_filter-example_5.cpp b/example/kalman_filter/kalman_filter-example_5.cpp
@@ -21,12 +21,16 @@
 // SOFTWARE.
 
 #include "kalman.h"
+#include <array>
+#include <iostream>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/format.h>
 #include <mp-units/math.h>
 #include <mp-units/systems/isq/space_and_time.h>
 #include <mp-units/systems/si/unit_symbols.h>
-#include <array>
-#include <iostream>
+#endif
 
 // Based on: https://www.kalmanfilter.net/kalman1d.html#ex5
 

diff --git a/example/kalman_filter/kalman_filter-example_6.cpp b/example/kalman_filter/kalman_filter-example_6.cpp
@@ -21,13 +21,17 @@
 // SOFTWARE.
 
 #include "kalman.h"
+#include <array>
+#include <iostream>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/format.h>
 #include <mp-units/math.h>
 #include <mp-units/quantity_point.h>
 #include <mp-units/systems/isq/thermodynamics.h>
 #include <mp-units/systems/si/si.h>
-#include <array>
-#include <iostream>
+#endif
 
 // Based on: https://www.kalmanfilter.net/kalman1d.html#ex6