commit 23041f53ea3c15e2bed267d06c2932310b19a3ad
Author: Kornel Benko <kor...@lyx.org>
Date:   Sat Oct 27 20:51:57 2018 +0200

    Amend 4459603, MSVC versions >= 1915 allow std::regex
---
 CMakeLists.txt |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd1fe12..eaea862 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()
 

Reply via email to