feat: add module mp_units

2025-08-04 04:44:27 +02:00 · 2024-01-06 08:51:00 +01:00
parent f3ad392123
commit 7cb2099af5
92 changed files with 754 additions and 141 deletions
--- a/test/unit_test/runtime/CMakeLists.txt
+++ b/test/unit_test/runtime/CMakeLists.txt
@@ -25,7 +25,12 @@ cmake_minimum_required(VERSION 3.5)
 find_package(Catch2 3 CONFIG REQUIRED)

 add_executable(unit_tests_runtime distribution_test.cpp fmt_test.cpp math_test.cpp)
-target_link_libraries(unit_tests_runtime PRIVATE mp-units::mp-units Catch2::Catch2WithMain)
+if(TARGET mp-units::modules)
+    target_link_libraries(unit_tests_runtime PRIVATE mp-units::modules)
+else()
+    target_link_libraries(unit_tests_runtime PRIVATE mp-units::mp-units)
+endif()
+target_link_libraries(unit_tests_runtime PRIVATE Catch2::Catch2WithMain)

 if(${projectPrefix}BUILD_LA)
    find_package(wg21_linear_algebra CONFIG REQUIRED)
--- a/test/unit_test/runtime/almost_equals.h
+++ b/test/unit_test/runtime/almost_equals.h
@@ -21,9 +21,14 @@
 // SOFTWARE.

 #include <catch2/matchers/catch_matchers_templated.hpp>
+#include <mp-units/bits/fmt_hacks.h>
+#include <algorithm>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/format.h>
 #include <mp-units/quantity.h>
-#include <algorithm>
+#endif

 namespace mp_units {

--- a/test/unit_test/runtime/distribution_test.cpp
+++ b/test/unit_test/runtime/distribution_test.cpp
@@ -21,14 +21,18 @@
 // SOFTWARE.

 #include <catch2/catch_test_macros.hpp>
-#include <mp-units/ostream.h>
-#include <mp-units/random.h>
-#include <mp-units/systems/si/unit_symbols.h>
-#include <mp-units/systems/si/units.h>
 #include <array>
 #include <initializer_list>
 #include <random>
 #include <vector>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
+#include <mp-units/ostream.h>
+#include <mp-units/random.h>
+#include <mp-units/systems/si/unit_symbols.h>
+#include <mp-units/systems/si/units.h>
+#endif


 using namespace mp_units;
--- a/test/unit_test/runtime/fmt_test.cpp
+++ b/test/unit_test/runtime/fmt_test.cpp
@@ -22,6 +22,13 @@

 #include <catch2/catch_test_macros.hpp>
 #include <catch2/matchers/catch_matchers_exception.hpp>
+#include <mp-units/bits/fmt_hacks.h>
+#include <iomanip>
+#include <limits>
+#include <locale>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/customization_points.h>
 #include <mp-units/format.h>
 #include <mp-units/ostream.h>
@@ -29,9 +36,7 @@
 #include <mp-units/systems/isq/mechanics.h>
 #include <mp-units/systems/isq/space_and_time.h>
 #include <mp-units/systems/si/si.h>
-#include <iomanip>
-#include <limits>
-#include <locale>
+#endif

 template<class T>
  requires mp_units::is_scalar<T>
--- a/test/unit_test/runtime/linear_algebra_test.cpp
+++ b/test/unit_test/runtime/linear_algebra_test.cpp
@@ -21,6 +21,12 @@
 // SOFTWARE.

 #include <catch2/catch_test_macros.hpp>
+#include <mp-units/bits/fmt_hacks.h>
+#include <cmath>
+#include <matrix>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/customization_points.h>
 #include <mp-units/format.h>
 #include <mp-units/math.h>
@@ -28,8 +34,7 @@
 #include <mp-units/systems/isq/mechanics.h>
 #include <mp-units/systems/isq/space_and_time.h>
 #include <mp-units/systems/si/si.h>
-#include <cmath>
-#include <matrix>
+#endif

 template<typename Rep = double>
 using vector = STD_LA::fixed_size_column_vector<Rep, 3>;
--- a/test/unit_test/runtime/math_test.cpp
+++ b/test/unit_test/runtime/math_test.cpp
@@ -22,13 +22,17 @@

 #include "almost_equals.h"
 #include <catch2/catch_all.hpp>
+#include <limits>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/math.h>
 #include <mp-units/ostream.h>
 #include <mp-units/systems/angular/angular.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 <limits>
+#endif

 using namespace mp_units;
 using namespace mp_units::si::unit_symbols;
--- a/test/unit_test/static/CMakeLists.txt
+++ b/test/unit_test/static/CMakeLists.txt
@@ -23,7 +23,11 @@
 cmake_minimum_required(VERSION 3.5)

 add_library(unit_tests_static_truncating quantity_test.cpp)
-target_link_libraries(unit_tests_static_truncating PRIVATE mp-units::mp-units)
+if(TARGET mp-units::modules)
+    target_link_libraries(unit_tests_static_truncating PRIVATE mp-units::modules)
+else()
+    target_link_libraries(unit_tests_static_truncating PRIVATE mp-units::mp-units)
+endif()
 target_compile_options(
    unit_tests_static_truncating PRIVATE $<IF:$<CXX_COMPILER_ID:MSVC>,/wd4242 /wd4244,-Wno-conversion>
 )
@@ -64,5 +68,9 @@ add_library(
    usc_test.cpp
 )

-target_link_libraries(unit_tests_static PRIVATE mp-units::mp-units)
-target_link_libraries(unit_tests_static PRIVATE unit_tests_static_truncating mp-units::mp-units)
+if(TARGET mp-units::modules)
+    target_link_libraries(unit_tests_static PRIVATE mp-units::modules)
+else()
+    target_link_libraries(unit_tests_static PRIVATE mp-units::mp-units)
+endif()
+target_link_libraries(unit_tests_static PRIVATE unit_tests_static_truncating)
--- a/test/unit_test/static/angular_test.cpp
+++ b/test/unit_test/static/angular_test.cpp
@@ -20,8 +20,12 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.

-#include <mp-units/systems/isq_angle/isq_angle.h>
 #include <numbers>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
+#include <mp-units/systems/isq_angle/isq_angle.h>
+#endif

 namespace {

--- a/test/unit_test/static/cgs_test.cpp
+++ b/test/unit_test/static/cgs_test.cpp
@@ -21,10 +21,14 @@
 // SOFTWARE.

 #include "test_tools.h"
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/systems/cgs/cgs.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>
+#endif

 template<class T>
  requires mp_units::is_scalar<T>
--- a/test/unit_test/static/chrono_test.cpp
+++ b/test/unit_test/static/chrono_test.cpp
@@ -21,11 +21,16 @@
 // SOFTWARE.

 #include "test_tools.h"
+#include <ratio>
+#ifdef MP_UNITS_MODULES
+#include <chrono>
+import mp_units;
+#else
 #include <mp-units/bits/external/type_traits.h>
 #include <mp-units/chrono.h>
 #include <mp-units/quantity_point.h>
 #include <mp-units/systems/si/unit_symbols.h>
-#include <ratio>
+#endif

 namespace {

--- a/test/unit_test/static/compare_test.cpp
+++ b/test/unit_test/static/compare_test.cpp
@@ -20,8 +20,12 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.

+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/compare.h>
 #include <mp-units/systems/si/si.h>
+#endif

 namespace {

--- a/test/unit_test/static/concepts_test.cpp
+++ b/test/unit_test/static/concepts_test.cpp
@@ -20,16 +20,20 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.

+#include <chrono>
+#include <complex>
+#include <optional>
+#include <string>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/chrono.h>
 #include <mp-units/concepts.h>
 #include <mp-units/quantity_point.h>
 #include <mp-units/systems/isq/space_and_time.h>
 #include <mp-units/systems/natural/natural.h>
 #include <mp-units/systems/si/si.h>
-#include <chrono>
-#include <complex>
-#include <optional>
-#include <string>
+#endif

 template<typename T>
 inline constexpr bool mp_units::is_scalar<std::complex<T>> = true;
--- a/test/unit_test/static/custom_rep_test_min_expl.cpp
+++ b/test/unit_test/static/custom_rep_test_min_expl.cpp
@@ -20,11 +20,15 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.

+#include <ostream>
+#include <type_traits>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <units/generic/dimensionless.h>
 #include <units/isq/si/length.h>
 #include <units/isq/si/prefixes.h>
-#include <ostream>
-#include <type_traits>
+#endif

 namespace {

--- a/test/unit_test/static/custom_rep_test_min_impl.cpp
+++ b/test/unit_test/static/custom_rep_test_min_impl.cpp
@@ -20,8 +20,14 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.

-#include <mp-units/systems/si/units.h>
+#include <mp-units/bits/external/hacks.h>
+#include <concepts>
 #include <type_traits>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
+#include <mp-units/systems/si/units.h>
+#endif

 namespace {

--- a/test/unit_test/static/dimension_test.cpp
+++ b/test/unit_test/static/dimension_test.cpp
@@ -21,11 +21,15 @@
 // SOFTWARE.

 #include "test_tools.h"
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/dimension.h>
 #include <mp-units/quantity.h>
 #include <mp-units/quantity_spec.h>
 #include <mp-units/reference.h>
 #include <mp-units/unit.h>
+#endif

 namespace {

--- a/test/unit_test/static/fixed_string_test.cpp
+++ b/test/unit_test/static/fixed_string_test.cpp
@@ -20,7 +20,11 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.

+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/bits/external/fixed_string.h>
+#endif

 using namespace mp_units;

--- a/test/unit_test/static/fractional_exponent_quantity.cpp
+++ b/test/unit_test/static/fractional_exponent_quantity.cpp
@@ -20,9 +20,14 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.

+#include <mp-units/quantity_spec_macro.h>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/math.h>
 #include <mp-units/systems/isq/electromagnetism.h>
 #include <mp-units/systems/si/units.h>
+#endif

 namespace {

--- a/test/unit_test/static/hep_test.cpp
+++ b/test/unit_test/static/hep_test.cpp
@@ -20,10 +20,14 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.

+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/systems/hep/hep.h>
 #include <mp-units/systems/isq/mechanics.h>
 #include <mp-units/systems/isq/space_and_time.h>
 #include <mp-units/systems/si/si.h>
+#endif

 template<class T>
  requires mp_units::is_scalar<T>
--- a/test/unit_test/static/iau_test.cpp
+++ b/test/unit_test/static/iau_test.cpp
@@ -20,9 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.

+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/math.h>
 #include <mp-units/systems/iau/iau.h>
 #include <mp-units/systems/si/unit_symbols.h>
+#endif

 /* ************** DERIVED DIMENSIONS THAT INCLUDE UNITS WITH SPECIAL NAMES **************** */

--- a/test/unit_test/static/iec80000_test.cpp
+++ b/test/unit_test/static/iec80000_test.cpp
@@ -20,10 +20,14 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.

+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/quantity.h>
 #include <mp-units/reference.h>
 #include <mp-units/systems/iec80000/iec80000.h>
 #include <mp-units/systems/si/unit_symbols.h>
+#endif

 /* ************** DERIVED DIMENSIONS THAT INCLUDE UNITS WITH SPECIAL NAMES **************** */

--- a/test/unit_test/static/imperial_test.cpp
+++ b/test/unit_test/static/imperial_test.cpp
@@ -20,9 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.

+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/systems/imperial/imperial.h>
 #include <mp-units/systems/isq/space_and_time.h>
 #include <mp-units/systems/si/unit_symbols.h>
+#endif

 namespace {

--- a/test/unit_test/static/international_test.cpp
+++ b/test/unit_test/static/international_test.cpp
@@ -20,12 +20,16 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.

+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/math.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/constants.h>
 #include <mp-units/systems/si/units.h>
+#endif

 template<class T>
  requires mp_units::is_scalar<T>
--- a/test/unit_test/static/isq_angle_test.cpp
+++ b/test/unit_test/static/isq_angle_test.cpp
@@ -20,8 +20,12 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.

+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/systems/isq_angle/isq_angle.h>
 #include <mp-units/systems/si/unit_symbols.h>
+#endif

 namespace {

--- a/test/unit_test/static/isq_test.cpp
+++ b/test/unit_test/static/isq_test.cpp
@@ -20,9 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.

+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/reference.h>
 #include <mp-units/systems/isq/isq.h>
 #include <mp-units/systems/si/unit_symbols.h>
+#endif

 namespace {

--- a/test/unit_test/static/magnitude_test.cpp
+++ b/test/unit_test/static/magnitude_test.cpp
@@ -20,9 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.

+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <units/bits/magnitude.h>
 #include <units/bits/ratio.h>
 #include <type_traits>
+#endif

 using namespace units;
 using namespace units::detail;
--- a/test/unit_test/static/math_test.cpp
+++ b/test/unit_test/static/math_test.cpp
@@ -20,11 +20,15 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.

+#include <optional>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/math.h>  // IWYU pragma: keep
 #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 <optional>
+#endif

 namespace {

--- a/test/unit_test/static/natural_test.cpp
+++ b/test/unit_test/static/natural_test.cpp
@@ -20,8 +20,12 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.

+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/math.h>
 #include <mp-units/systems/natural/natural.h>
+#endif

 template<class T>
  requires mp_units::is_scalar<T>
--- a/test/unit_test/static/prime_test.cpp
+++ b/test/unit_test/static/prime_test.cpp
@@ -20,9 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.

-#include <mp-units/bits/external/prime.h>
 #include <type_traits>
 #include <utility>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
+#include <mp-units/bits/external/prime.h>
+#endif

 using namespace mp_units::detail;

--- a/test/unit_test/static/quantity_point_test.cpp
+++ b/test/unit_test/static/quantity_point_test.cpp
@@ -21,14 +21,19 @@
 // SOFTWARE.

 #include "test_tools.h"
+#include <limits>
+#include <type_traits>
+#include <utility>
+#ifdef MP_UNITS_MODULES
+#include <chrono>
+import mp_units;
+#else
 #include <mp-units/chrono.h>
 #include <mp-units/quantity_point.h>
 #include <mp-units/systems/isq/isq.h>
 #include <mp-units/systems/si/si.h>
 #include <mp-units/systems/usc/usc.h>
-#include <limits>
-#include <type_traits>
-#include <utility>
+#endif

 namespace {

--- a/test/unit_test/static/quantity_spec_test.cpp
+++ b/test/unit_test/static/quantity_spec_test.cpp
@@ -21,10 +21,14 @@
 // SOFTWARE.

 #include "test_tools.h"
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/quantity.h>
 #include <mp-units/quantity_spec.h>
 #include <mp-units/reference.h>
 #include <mp-units/unit.h>
+#endif

 namespace {

--- a/test/unit_test/static/quantity_test.cpp
+++ b/test/unit_test/static/quantity_test.cpp
@@ -21,12 +21,17 @@
 // SOFTWARE.

 #include "test_tools.h"
+#include <limits>
+#include <utility>
+#ifdef MP_UNITS_MODULES
+#include <chrono>
+import mp_units;
+#else
 #include <mp-units/chrono.h>
 #include <mp-units/systems/isq/mechanics.h>
 #include <mp-units/systems/isq/space_and_time.h>
 #include <mp-units/systems/si/si.h>
-#include <limits>
-#include <utility>
+#endif

 template<>
 inline constexpr bool mp_units::is_vector<int> = true;
--- a/test/unit_test/static/ratio_test.cpp
+++ b/test/unit_test/static/ratio_test.cpp
@@ -20,7 +20,11 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.

+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/bits/ratio.h>
+#endif

 namespace {

--- a/test/unit_test/static/reference_test.cpp
+++ b/test/unit_test/static/reference_test.cpp
@@ -21,6 +21,9 @@
 // SOFTWARE.

 #include "test_tools.h"
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/dimension.h>
 #include <mp-units/quantity.h>
 #include <mp-units/quantity_spec.h>
@@ -28,6 +31,7 @@
 #include <mp-units/system_reference.h>
 #include <mp-units/systems/si/prefixes.h>
 #include <mp-units/unit.h>
+#endif

 namespace {

--- a/test/unit_test/static/si_test.cpp
+++ b/test/unit_test/static/si_test.cpp
@@ -20,8 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.

+#include <type_traits>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/math.h>
 #include <mp-units/systems/si/si.h>
+#endif

 namespace {

--- a/test/unit_test/static/symbol_text_test.cpp
+++ b/test/unit_test/static/symbol_text_test.cpp
@@ -20,7 +20,11 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.

+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/bits/symbol_text.h>
+#endif

 using namespace mp_units;

--- a/test/unit_test/static/test_tools.h
+++ b/test/unit_test/static/test_tools.h
@@ -22,8 +22,13 @@

 #pragma once

-#include <mp-units/quantity_spec.h>
 #include <type_traits>
+#ifdef MP_UNITS_MODULES
+#include <mp-units/quantity_spec_macro.h>
+import mp_units;
+#else
+#include <mp-units/quantity_spec.h>
+#endif

 template<auto V, typename T>
 inline constexpr bool is_of_type = std::is_same_v<std::remove_cvref_t<decltype(V)>, T>;
--- a/test/unit_test/static/type_list_test.cpp
+++ b/test/unit_test/static/type_list_test.cpp
@@ -20,8 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.

+#include <type_traits>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/bits/external/type_list.h>
 #include <mp-units/bits/external/type_traits.h>
+#endif

 namespace {

--- a/test/unit_test/static/typographic_test.cpp
+++ b/test/unit_test/static/typographic_test.cpp
@@ -20,9 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.

+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/systems/international/international.h>
 #include <mp-units/systems/isq/space_and_time.h>
 #include <mp-units/systems/typographic/typographic.h>
+#endif

 namespace {

--- a/test/unit_test/static/unit_symbol_test.cpp
+++ b/test/unit_test/static/unit_symbol_test.cpp
@@ -20,9 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.

+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/systems/iau/iau.h>
 #include <mp-units/systems/iec80000/iec80000.h>
 #include <mp-units/systems/si/si.h>
+#endif

 namespace {

--- a/test/unit_test/static/unit_test.cpp
+++ b/test/unit_test/static/unit_test.cpp
@@ -21,11 +21,15 @@
 // SOFTWARE.

 #include "test_tools.h"
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #include <mp-units/dimension.h>
 #include <mp-units/quantity.h>
 #include <mp-units/reference.h>
 #include <mp-units/systems/si/prefixes.h>
 #include <mp-units/unit.h>
+#endif

 namespace {

--- a/test/unit_test/static/usc_test.cpp
+++ b/test/unit_test/static/usc_test.cpp
@@ -20,10 +20,15 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.

+#include <mp-units/bits/external/hacks.h>
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
 #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 <mp-units/systems/usc/usc.h>
+#endif

 namespace {