X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=3f491581b821fb0f6e4655008794e4a0527b7238;hb=d33f4c91f24ed9bb8baf09d23525ff045e2055ea;hp=5409746276c38fa259d8480ca71a5958dfe7059e;hpb=9126a99e97a23f5045da11dd6b13aa997b23bb44;p=lyx.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5409746276..3f491581b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -246,12 +246,11 @@ set(LYX_GCC11_MODE)
 if(UNIX OR MINGW)
 	execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
 	message(STATUS "Using GCC version ${GCC_VERSION}")
-# disabled because of missing match_partial
-#	if(GCC_VERSION VERSION_LESS 4.9)
+	if(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)
-#	endif()
+	endif()
 	if (LYX_ENABLE_CXX11)
 		find_package(CXX11Compiler)
 		if(NOT CXX11COMPILER_FOUND)
@@ -260,7 +259,6 @@ if(UNIX OR MINGW)
 		set(LYX_GCC11_MODE "${CXX11_FLAG}")
 	endif()
 else()
-# disabled because of missing match_partial
 	set(LYX_USE_STD_REGEX 0)
 #	if(MSVC10)
 #		set(LYX_USE_STD_REGEX 1) #TODO should we use it in ECMAScript mode?
@@ -632,7 +630,11 @@ find_package(ZLIB REQUIRED)
 
 if(LYX_EXTERNAL_BOOST)
 	message(STATUS "Searching for boost")
-	find_package(Boost COMPONENTS signals regex) #TODO could REQUIRED be used
+	if(LYX_USE_STD_REGEX)
+		find_package(Boost COMPONENTS signals)
+	else()
+		find_package(Boost COMPONENTS signals regex)
+	endif()
 	if(Boost_FOUND)
 		message(STATUS "Boost found")
 		message(STATUS "Boost-libs = ${Boost_LIBRARIES}")