diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 34ba13c6..c8a43497 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -66,8 +66,14 @@ if(${projectPrefix}BUILD_CXX_MODULES)
     )
     target_compile_definitions(mp-units-core-module PUBLIC ${projectPrefix}MODULES)
     target_link_libraries(mp-units-core-module PRIVATE mp-units::core mp-units::utility PUBLIC mp-units::core-macros)
-    if(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 18)
-        target_compile_options(mp-units-core-module PUBLIC "-Wno-include-angled-in-module-purview")
+    if(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
+        if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18)
+            target_compile_definitions(mp-units-core-module PUBLIC _LIBCPP_NO_ABI_TAG)
+        endif()
+    
+        if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 18)
+            target_compile_options(mp-units-core-module PUBLIC "-Wno-include-angled-in-module-purview")
+        endif()
     endif()
 
     add_library(mp-units-core-fmt-module)