refactor: core-fmt and core-ostream modules merged with core

mpusz · Dec 29, 2023 · af47898 · af47898
1 parent 8f55e13
commit af47898
Show file tree

Hide file tree

Showing 28 changed files with 80 additions and 198 deletions.
diff --git a/example/clcpp_response.cpp b/example/clcpp_response.cpp
@@ -15,7 +15,7 @@
  along with this program. If not, see http://www.gnu.org/licenses./
 */
 
-#include <mp-units/compat_fmt_macros.h>
+#include <mp-units/compat_macros.h>
 #include <iostream>
 #ifdef MP_UNITS_MODULES
 import mp_units;

diff --git a/example/conversion_factor.cpp b/example/conversion_factor.cpp
@@ -15,7 +15,7 @@
  along with this program. If not, see http://www.gnu.org/licenses./
 */
 
-#include <mp-units/compat_fmt_macros.h>
+#include <mp-units/compat_macros.h>
 #include <iostream>
 #include <type_traits>
 #ifdef MP_UNITS_MODULES

diff --git a/example/currency.cpp b/example/currency.cpp
@@ -24,7 +24,7 @@
 #include <iostream>
 #include <map>
 #ifdef MP_UNITS_MODULES
-import mp_units.core_io;
+import mp_units.core;
 #else
 #include <mp-units/ostream.h>
 #include <mp-units/quantity.h>

diff --git a/example/foot_pound_second.cpp b/example/foot_pound_second.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/compat_fmt_macros.h>
+#include <mp-units/compat_macros.h>
 #include <iostream>
 #include <string_view>
 #ifdef MP_UNITS_MODULES

diff --git a/example/glide_computer.cpp b/example/glide_computer.cpp
@@ -21,7 +21,7 @@
 // SOFTWARE.
 
 #include "glide_computer_lib.h"
-#include <mp-units/compat_fmt_macros.h>
+#include <mp-units/compat_macros.h>
 #include <array>
 #include <exception>
 #include <iostream>

diff --git a/example/hello_units.cpp b/example/hello_units.cpp
@@ -25,7 +25,7 @@
 // !!! renders correctly in the documentation "Examples" section.                 !!!
 // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-#include <mp-units/compat_fmt_macros.h>
+#include <mp-units/compat_macros.h>
 #include <iostream>
 #ifdef MP_UNITS_MODULES
 import mp_units;

diff --git a/example/include/geographic.h b/example/include/geographic.h
@@ -23,7 +23,7 @@
 #pragma once
 
 #include "ranged_representation.h"
-#include <mp-units/compat_fmt_macros.h>
+#include <mp-units/compat_macros.h>
 #include <compare>
 #include <limits>
 #include <numbers>

diff --git a/example/include/validated_type.h b/example/include/validated_type.h
@@ -23,7 +23,7 @@
 #pragma once
 
 #include <gsl/gsl-lite.hpp>
-#include <mp-units/compat_fmt_macros.h>
+#include <mp-units/compat_macros.h>
 #include <ostream>
 #include <utility>
 #ifdef MP_UNITS_MODULES

diff --git a/example/kalman_filter/kalman.h b/example/kalman_filter/kalman.h
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <mp-units/compat_fmt_macros.h>
+#include <mp-units/compat_macros.h>
 #include <tuple>
 #ifdef MP_UNITS_MODULES
 import mp_units;

diff --git a/example/si_constants.cpp b/example/si_constants.cpp
@@ -25,7 +25,7 @@
 // !!! renders correctly in the documentation "Examples" section.                 !!!
 // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-#include <mp-units/compat_fmt_macros.h>
+#include <mp-units/compat_macros.h>
 #include <iostream>
 #ifdef MP_UNITS_MODULES
 import mp_units;

diff --git a/example/spectroscopy_units.cpp b/example/spectroscopy_units.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/compat_fmt_macros.h>
+#include <mp-units/compat_macros.h>
 #include <iostream>
 #include <tuple>
 #ifdef MP_UNITS_MODULES

diff --git a/example/storage_tank.cpp b/example/storage_tank.cpp
@@ -20,7 +20,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include <mp-units/compat_fmt_macros.h>
 #include <mp-units/compat_macros.h>
 #include <cassert>
 #include <chrono>

diff --git a/example/unmanned_aerial_vehicle.cpp b/example/unmanned_aerial_vehicle.cpp
@@ -21,7 +21,7 @@
 // SOFTWARE.
 
 #include "geographic.h"
-#include <mp-units/compat_fmt_macros.h>
+#include <mp-units/compat_macros.h>
 #include <cassert>
 #include <iostream>
 #ifdef MP_UNITS_MODULES

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -47,13 +47,11 @@ if(${projectPrefix}AS_SYSTEM_HEADERS)
 endif()
 
 add_subdirectory(core)
-add_subdirectory(core-fmt)
-add_subdirectory(core-io)
 add_subdirectory(systems)
 
 # project-wide wrapper
 add_units_module(
-    mp-units DEPENDENCIES mp-units::core mp-units::core-io mp-units::core-fmt mp-units::systems
+    mp-units DEPENDENCIES mp-units::core mp-units::systems
     MODULE_INTERFACE_UNIT mp-units.cpp
 )
 

diff --git a/src/core-fmt/CMakeLists.txt b/src/core-fmt/CMakeLists.txt
diff --git a/src/core-fmt/include/mp-units/compat_fmt_macros.h b/src/core-fmt/include/mp-units/compat_fmt_macros.h
diff --git a/src/core-fmt/mp-units-core-fmt.cpp b/src/core-fmt/mp-units-core-fmt.cpp
diff --git a/src/core-io/CMakeLists.txt b/src/core-io/CMakeLists.txt
diff --git a/src/core-io/mp-units-core-io.cpp b/src/core-io/mp-units-core-io.cpp
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -42,6 +42,7 @@ add_units_module(
             include/mp-units/bits/core_gmf.h
             include/mp-units/bits/dimension_concepts.h
             include/mp-units/bits/expression_template.h
+            include/mp-units/bits/fmt.h
             include/mp-units/bits/get_associated_quantity.h
             include/mp-units/bits/get_common_base.h
             include/mp-units/bits/magnitude.h
@@ -63,7 +64,9 @@ add_units_module(
             include/mp-units/core.h
             include/mp-units/customization_points.h
             include/mp-units/dimension.h
+            include/mp-units/format.h
             include/mp-units/math.h
+            include/mp-units/ostream.h
             include/mp-units/quantity.h
             include/mp-units/quantity_point.h
             include/mp-units/quantity_spec.h
@@ -74,6 +77,17 @@ add_units_module(
     MODULE_INTERFACE_UNIT mp-units-core.cpp
 )
 
+target_compile_definitions(
+    mp-units-core ${${projectPrefix}TARGET_SCOPE} ${projectPrefix}USE_LIBFMT=$<BOOL:${${projectPrefix}USE_LIBFMT}>
+)
+
+if(${projectPrefix}USE_LIBFMT)
+    if(NOT TARGET fmt::fmt)
+        find_package(fmt CONFIG REQUIRED)
+    endif()
+    target_link_libraries(mp-units-core ${${projectPrefix}TARGET_SCOPE} fmt::fmt)
+endif()
+
 if(${projectPrefix}BUILD_CXX_MODULES)
     if(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
         if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18)