diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2e2ad7b..32acde84 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -178,6 +178,10 @@ set(FMT_SOURCES src/format.cc src/os.cc)
 add_library(fmt ${FMT_SOURCES} ${FMT_HEADERS} README.rst ChangeLog.rst)
 add_library(fmt::fmt ALIAS fmt)
 
+if (MSVC) 
+  target_compile_options(fmt PRIVATE /Zc:__cplusplus)
+endif ()
+
 if (HAVE_STRTOD_L)
   target_compile_definitions(fmt PUBLIC FMT_LOCALE)
 endif ()
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 89176633..4692f649 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -97,6 +97,7 @@ add_fmt_test(gtest-extra-test)
 add_fmt_test(format-test mock-allocator.h)
 if (MSVC)
   target_compile_options(format-test PRIVATE /bigobj)
+  target_compile_options(format-test PRIVATE /Zc:__cplusplus)
 endif ()
 if (NOT (MSVC AND BUILD_SHARED_LIBS))
   add_fmt_test(format-impl-test)