From: Kornel Benko <kornel@lyx.org>
Date: Sat, 26 Oct 2019 13:31:25 +0000 (+0200)
Subject: Arrgh: not everything is done with cherryy-pick. Amend 24fae9f5
X-Git-Tag: 2.3.4~38
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=4e3addc6e141fe8276c09901cff762c5bb60e6e2;p=features.git

Arrgh: not everything is done with cherryy-pick. Amend 24fae9f5
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f800849c1..8c3a947243 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -303,10 +303,10 @@ else()
 	if(MSVC_VERSION LESS 1900)
 		# Drop support for msvc versions prior to 1900 (Visual Studio 2015)
 		message(FATAL_ERROR "Visual Studio >= 2015 is required.")
-	set(LYX_USE_STD_REGEX 0)
-#	if(MSVC10)
-#		set(LYX_USE_STD_REGEX 1) #TODO should we use it in ECMAScript mode?
-#	endif()
+		set(LYX_USE_STD_REGEX 0)
+	else()
+		set(LYX_USE_STD_REGEX 1)
+	endif()
 endif()