refactor: modules support redesigned

2025-08-03 12:24:26 +02:00 · 2024-01-06 08:51:01 +01:00
parent b582e200a0
commit 0eaf6e2e56
129 changed files with 271 additions and 838 deletions
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -22,7 +22,5 @@

 cmake_minimum_required(VERSION 3.5)

-add_subdirectory(unit_test/runtime)
-add_subdirectory(unit_test/static)
-
-# add_subdirectory(metabench)
+add_subdirectory(runtime)
+add_subdirectory(static)
--- a/test/unit_test/runtime/CMakeLists.txt
+++ b/test/unit_test/runtime/CMakeLists.txt
@@ -25,12 +25,10 @@ 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)
-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)
+if(${projectPrefix}BUILD_CXX_MODULES)
+    target_compile_definitions(unit_tests_runtime PUBLIC ${projectPrefix}MODULES)
 endif()
-target_link_libraries(unit_tests_runtime PRIVATE Catch2::Catch2WithMain)
+target_link_libraries(unit_tests_runtime PRIVATE mp-units::mp-units 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,7 +21,7 @@
 // SOFTWARE.

 #include <catch2/matchers/catch_matchers_templated.hpp>
-#include <mp-units/bits/fmt_hacks.h>
+#include <mp-units/compat_fmt_macros.h>
 #include <algorithm>
 #ifdef MP_UNITS_MODULES
 import mp_units;
--- a/test/unit_test/runtime/distribution_test.cpp
+++ b/test/unit_test/runtime/distribution_test.cpp
--- a/test/unit_test/runtime/fmt_test.cpp
+++ b/test/unit_test/runtime/fmt_test.cpp
@@ -22,7 +22,7 @@

 #include <catch2/catch_test_macros.hpp>
 #include <catch2/matchers/catch_matchers_exception.hpp>
-#include <mp-units/bits/fmt_hacks.h>
+#include <mp-units/compat_fmt_macros.h>
 #include <iomanip>
 #include <limits>
 #include <locale>
--- a/test/unit_test/runtime/linear_algebra_test.cpp
+++ b/test/unit_test/runtime/linear_algebra_test.cpp
@@ -21,7 +21,7 @@
 // SOFTWARE.

 #include <catch2/catch_test_macros.hpp>
-#include <mp-units/bits/fmt_hacks.h>
+#include <mp-units/compat_fmt_macros.h>
 #include <cmath>
 #include <matrix>
 #ifdef MP_UNITS_MODULES
--- a/test/unit_test/runtime/math_test.cpp
+++ b/test/unit_test/runtime/math_test.cpp
@@ -30,8 +30,7 @@ import mp_units;
 #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 <mp-units/systems/si/si.h>
 #endif

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

 add_library(unit_tests_static_truncating quantity_test.cpp)
-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)
+if(${projectPrefix}BUILD_CXX_MODULES)
+    target_compile_definitions(unit_tests_static_truncating PUBLIC ${projectPrefix}MODULES)
 endif()
+target_link_libraries(unit_tests_static_truncating PRIVATE mp-units::mp-units)
 target_compile_options(
    unit_tests_static_truncating PRIVATE $<IF:$<CXX_COMPILER_ID:MSVC>,/wd4242 /wd4244,-Wno-conversion>
 )
@@ -68,9 +67,8 @@ add_library(
    usc_test.cpp
 )

-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)
+target_link_libraries(unit_tests_static PRIVATE mp-units::mp-units)
+if(${projectPrefix}BUILD_CXX_MODULES)
+    target_compile_definitions(unit_tests_static PUBLIC ${projectPrefix}MODULES)
 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
--- a/test/unit_test/static/cgs_test.cpp
+++ b/test/unit_test/static/cgs_test.cpp
--- a/test/unit_test/static/chrono_test.cpp
+++ b/test/unit_test/static/chrono_test.cpp
@@ -27,9 +27,8 @@
 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 <mp-units/systems/si/si.h>
 #endif

 namespace {
--- a/test/unit_test/static/compare_test.cpp
+++ b/test/unit_test/static/compare_test.cpp
--- a/test/unit_test/static/concepts_test.cpp
+++ b/test/unit_test/static/concepts_test.cpp
@@ -27,7 +27,6 @@
 #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>
--- a/test/unit_test/static/custom_rep_test_min_expl.cpp
+++ b/test/unit_test/static/custom_rep_test_min_expl.cpp
--- a/test/unit_test/static/custom_rep_test_min_impl.cpp
+++ b/test/unit_test/static/custom_rep_test_min_impl.cpp
--- a/test/unit_test/static/dimension_test.cpp
+++ b/test/unit_test/static/dimension_test.cpp
--- a/test/unit_test/static/fixed_string_test.cpp
+++ b/test/unit_test/static/fixed_string_test.cpp
--- a/test/unit_test/static/fractional_exponent_quantity.cpp
+++ b/test/unit_test/static/fractional_exponent_quantity.cpp
@@ -20,7 +20,7 @@
 // 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 <mp-units/compat_macros.h>
 #ifdef MP_UNITS_MODULES
 import mp_units;
 #else
--- a/test/unit_test/static/hep_test.cpp
+++ b/test/unit_test/static/hep_test.cpp
--- a/test/unit_test/static/iau_test.cpp
+++ b/test/unit_test/static/iau_test.cpp
--- a/test/unit_test/static/iec80000_test.cpp
+++ b/test/unit_test/static/iec80000_test.cpp
--- a/test/unit_test/static/imperial_test.cpp
+++ b/test/unit_test/static/imperial_test.cpp
--- a/test/unit_test/static/international_test.cpp
+++ b/test/unit_test/static/international_test.cpp
--- a/test/unit_test/static/isq_angle_test.cpp
+++ b/test/unit_test/static/isq_angle_test.cpp
--- a/test/unit_test/static/isq_test.cpp
+++ b/test/unit_test/static/isq_test.cpp
--- a/test/unit_test/static/magnitude_test.cpp
+++ b/test/unit_test/static/magnitude_test.cpp
--- a/test/unit_test/static/math_test.cpp
+++ b/test/unit_test/static/math_test.cpp
--- a/test/unit_test/static/natural_test.cpp
+++ b/test/unit_test/static/natural_test.cpp
--- a/test/unit_test/static/prime_test.cpp
+++ b/test/unit_test/static/prime_test.cpp
--- a/test/unit_test/static/quantity_point_test.cpp
+++ b/test/unit_test/static/quantity_point_test.cpp
@@ -28,7 +28,6 @@
 #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>
--- a/test/unit_test/static/quantity_spec_test.cpp
+++ b/test/unit_test/static/quantity_spec_test.cpp
--- a/test/unit_test/static/quantity_test.cpp
+++ b/test/unit_test/static/quantity_test.cpp
@@ -29,7 +29,6 @@
 #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>
--- a/test/unit_test/static/ratio_test.cpp
+++ b/test/unit_test/static/ratio_test.cpp
--- a/test/unit_test/static/reference_test.cpp
+++ b/test/unit_test/static/reference_test.cpp
--- a/test/unit_test/static/si_test.cpp
+++ b/test/unit_test/static/si_test.cpp
--- a/test/unit_test/static/symbol_text_test.cpp
+++ b/test/unit_test/static/symbol_text_test.cpp
--- a/test/unit_test/static/test_tools.h
+++ b/test/unit_test/static/test_tools.h
@@ -24,7 +24,7 @@

 #include <type_traits>
 #ifdef MP_UNITS_MODULES
-#include <mp-units/quantity_spec_macro.h>
+#include <mp-units/compat_macros.h>
 import mp_units;
 #else
 #include <mp-units/quantity_spec.h>
--- a/test/unit_test/static/type_list_test.cpp
+++ b/test/unit_test/static/type_list_test.cpp
--- a/test/unit_test/static/typographic_test.cpp
+++ b/test/unit_test/static/typographic_test.cpp
--- a/test/unit_test/static/unit_symbol_test.cpp
+++ b/test/unit_test/static/unit_symbol_test.cpp
--- a/test/unit_test/static/unit_test.cpp
+++ b/test/unit_test/static/unit_test.cpp
--- a/test/unit_test/static/usc_test.cpp
+++ b/test/unit_test/static/usc_test.cpp