From: Kornel Benko <kornel@lyx.org>
Date: Sat, 27 Oct 2018 18:51:57 +0000 (+0200)
Subject: Amend 4459603, MSVC versions >= 1915 allow std::regex
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~2952
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=23041f53;p=features.git

Amend 4459603, MSVC versions >= 1915 allow std::regex
---

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()