diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index be3d3336f..936384f19 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1007,6 +1007,8 @@ if (MSVC)
         /wd4505
         /wd4100
         /wd4267
+        # Enable updated '__cplusplus' macro - workaround for CMake#18837
+        /Zc:__cplusplus
     )
     # Disable min/max macros from Windows.h
     target_compile_definitions(${LIBRARY_PROJECT} PUBLIC NOMINMAX)