mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-25 02:49:46 +00:00
Make build: amend 6f2cd26103
(allow more compilers)
Allow gcc 4.7 and 4.8, but use boost regex Allow visual studio 2015.
This commit is contained in:
parent
2a37ad9cce
commit
1f90cd3b3f
@ -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)
|
||||
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)
|
||||
|
Loading…
Reference in New Issue
Block a user