From 23041f53ea3c15e2bed267d06c2932310b19a3ad Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Sat, 27 Oct 2018 20:51:57 +0200 Subject: [PATCH] Amend 4459603, MSVC versions >= 1915 allow std::regex --- CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fd1fe126b0..eaea862108 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -285,9 +285,10 @@ if(UNIX OR MINGW) endif() set(LYX_GCC11_MODE "${CXX11_FLAG}") else() - set(LYX_USE_STD_REGEX 0) - if(MSVC10) - set(LYX_USE_STD_REGEX 1) #TODO should we use it in ECMAScript mode? + if(MSVC_VERSION LESS 1915)) + set(LYX_USE_STD_REGEX 0) + else() + set(LYX_USE_STD_REGEX 1) endif() endif()