]> git.lyx.org Git - features.git/commitdiff
Amend 4459603, MSVC versions >= 1915 allow std::regex
authorKornel Benko <kornel@lyx.org>
Sat, 27 Oct 2018 18:51:57 +0000 (20:51 +0200)
committerKornel Benko <kornel@lyx.org>
Sat, 27 Oct 2018 18:51:57 +0000 (20:51 +0200)
CMakeLists.txt

index fd1fe126b048a2c0f18b242eaed833ca4dad2a68..eaea862108c934ec808b8fa70f56f8398d16fb5a 100644 (file)
@@ -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()