[LyX/2.3.x] Arrgh: not everything is done with cherryy-pick. Amend 24fae9f5

Kornel Benko kornel at lyx.org
Sat Oct 26 13:18:33 UTC 2019


commit 4e3addc6e141fe8276c09901cff762c5bb60e6e2
Author: Kornel Benko <kornel at lyx.org>
Date:   Sat Oct 26 15:31:25 2019 +0200

    Arrgh: not everything is done with cherryy-pick. Amend 24fae9f5
---
 CMakeLists.txt |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f80084..8c3a947 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()
 
 


More information about the lyx-cvs mailing list