X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=d7112b1a49ed7d8598be207391e7ac8c9b75ce57;hb=8556cb1c66c6548c110cc96e2c8245102cefb906;hp=acaad7c08c3c088742df1d762e39d2d25dd79eb8;hpb=6f2cd26103d0d59fd76184fd76af89cb8817ad4f;p=lyx.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index acaad7c08c..d7112b1a49 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -291,18 +291,21 @@ if(UNIX OR MINGW)
 	    #message(STATUS "dumpversion: error = ${_error}, result = ${_err}")
 	  endif()
 	  message(STATUS "Using GCC version ${GCC_VERSION}")
-	  if(GCC_VERSION VERSION_LESS 4.9)
-		  # Drop support for gcc versions prior to 4.9
-		  message(FATAL_ERROR "gcc >= 4.9 is required.")
+	  if(GCC_VERSION VERSION_LESS 4.6)
+		message(FATAL_ERROR "gcc >= 4.6 is required.")
+	  elseif(GCC_VERSION VERSION_LESS 4.9)
+		# <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()
-		  set(LYX_USE_STD_REGEX 1)
+		set(LYX_USE_STD_REGEX 1)
 	  endif()
 	endif()
 	set(LYX_GCC11_MODE "${CXX11_FLAG}")
 else()
-	if(MSVC_VERSION LESS 1915)
-		# Drop support for msvc versions prior to 1915
-		message(FATAL_ERROR "msvc >= 1915 is required.")
+	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)
 	else()
 		set(LYX_USE_STD_REGEX 1)
@@ -793,7 +796,7 @@ unset(LYX_PYTHON_EXECUTABLE CACHE)
 unset(PYTHON_VERSION_MAJOR)
 unset(PYTHON_VERSION_MINOR)
 unset(PYTHON_VERSION_STRING)
-find_package(PythonInterp 3.3 QUIET)
+find_package(PythonInterp 3.5 QUIET)
 if(NOT PYTHONINTERP_FOUND)
   unset(PYTHON_EXECUTABLE CACHE)
   find_package(PythonInterp 2.0 REQUIRED)