X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=5840ad08a03b388ba29b3b08fe1e056cc10b5ebf;hb=a15aafa2a1e7fa2cedce13e15d0622bc31a3fe46;hp=a87b049357d195c3f2317321b4fe25981567aa25;hpb=6a165ecba2080b2aa5e99260944a01ecb92525de;p=features.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a87b049357..5840ad08a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -255,6 +255,10 @@ if(UNIX OR MINGW)
 		# <regex> in gcc is unusable in versions less than 4.9.0
 		# see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631
 		set(LYX_USE_STD_REGEX 0)
+	else()
+		if (LYX_ENABLE_CXX11)
+			set(LYX_USE_STD_REGEX 1)
+		endif()
 	endif()
 	if (LYX_ENABLE_CXX11)
 		find_package(CXX11Compiler)
@@ -856,6 +860,10 @@ if(QTVERSION MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+).*")
 	MATH(EXPR QT4_VERSION "(${CMAKE_MATCH_1}<<16)|(${CMAKE_MATCH_2}<<8)|${CMAKE_MATCH_3}")
 endif()
 
+if (NOT HAVE_REGEX)
+	set(LYX_USE_STD_REGEX 0)
+endif()
+
 
 set (cmd ${CMAKE_CTEST_COMMAND})
 if (MSVC)