message(FATAL_ERROR "Exiting")
endif()
endif()
- # Enable LTO if supported
- if (POLICY CMP0069)
- cmake_policy(SET CMP0069 NEW)
- include(CheckIPOSupported)
- check_ipo_supported(RESULT result OUTPUT reason LANGUAGES CXX)
- if(result)
- message(STATUS "Setting IPO True")
- set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
- else()
- message(STATUS "Not setting IPO , result = ${result}, reason = ${reason}")
- endif()
- endif()
endif()
if(UNIX)
LYX_OPTION(ASAN "Use address sanitizer" OFF ALL)
LYX_COMBO(USE_FILEDIALOG "Use native or QT file dialog" QT NATIVE)
LYX_COMBO(USE_QT "Use Qt version as frontend" AUTO QT4 QT5)
+LYX_COMBO(USE_IPO "Interprocedural optimization" OFF AUTO ON)
#LYX_OPTION(3RDPARTY_BUILD "Build 3rdparty libs" OFF ALL)
LYX_OPTION(DISABLE_CALLSTACK_PRINTING "do not print a callstack when crashing" OFF ALL)
LYX_OPTION(EXTERNAL_Z "OFF := Build 3rdparty lib zlib" ON ALL)
LYX_COMBO(EXTERNAL_MYTHES "OFF := Build 3rdparty lib mytheslib" AUTO OFF ON)
# GCC specific
-LYX_OPTION(PROFILE "Build profile version" OFF GCC)
+LYX_OPTION(PROFILE "Build with options for gprof" OFF GCC)
LYX_OPTION(EXTERNAL_BOOST "Use external boost" OFF GCC)
LYX_OPTION(PROGRAM_SUFFIX "Append version suffix to binaries" ON GCC)
LYX_OPTION(DEBUG_GLIBC "Enable libstdc++ debug mode" OFF GCC)
LYX_OPTION(DEBUG_GLIBC_PEDANTIC "Enable libstdc++ pedantic debug mode" OFF GCC)
LYX_OPTION(STDLIB_DEBUG "Use debug stdlib" OFF GCC)
-LYX_OPTION(PROFILE "Build with options for gprof" OFF GCC)
# MSVC specific
LYX_OPTION(CONSOLE "Show console on Windows" ON MSVC)
endforeach()
endif()
-
-
message(STATUS)
set(EXECUTABLE_OUTPUT_PATH ${TOP_BINARY_DIR}/bin)
set(LIBRARY_OUTPUT_PATH ${TOP_BINARY_DIR}/lib)
endif()
+set(LYX_IPO_SUPPORTED OFF)
+if (POLICY CMP0069)
+ cmake_policy(SET CMP0069 NEW)
+ if(LYX_USE_IPO MATCHES "AUTO")
+ # Enable LTO if supported and not debugging
+ if (NOT LYX_DEBUG)
+ include(CheckIPOSupported)
+ check_ipo_supported(RESULT LYX_IPO_SUPPORTED)
+ endif()
+ else()
+ set(LYX_IPO_SUPPORTED ${LYX_USE_IPO})
+ endif()
+endif()
+if (LYX_IPO_SUPPORTED)
+ set(LYX_USE_IPO "ON" CACHE STRING "Use interprocedural optimization" FORCE)
+else()
+ set(LYX_USE_IPO "OFF" CACHE STRING "Use interprocedural optimization" FORCE)
+endif()
# Set to some meaningful default
find_package(CXX11Compiler)
set(LYX_USE_STD_REGEX 0)
endif()
else()
- execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpfullversion OUTPUT_VARIABLE GCC_VERSION ERROR_VARIABLE _error RESULT_VARIABLE _err OUTPUT_STRIP_TRAILING_WHITESPACE)
+ #message(STATUS "dumpfullversion: error = ${_error}, result = ${_err}")
+ if (_err)
+ # previous check failed, try again with _old_ parameter
+ execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION ERROR_VARIABLE _error RESULT_VARIABLE _err OUTPUT_STRIP_TRAILING_WHITESPACE)
+ #message(STATUS "dumpversion: error = ${_error}, result = ${_err}")
+ endif()
message(STATUS "Using GCC version ${GCC_VERSION}")
- if(GCC_VERSION VERSION_LESS 4.9)
- if(GCC_VERSION VERSION_LESS 4.6)
- message(FATAL_ERROR "gcc >= 4.6 is required.")
- endif()
- # <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)
+ 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)
+ 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)
macro(setstripped _varname)
if(${ARGC} GREATER 1)
string(STRIP "${ARGV1}" _v)
- message(STATUS "1. _v = ${_varname} ${_v}")
if (_v MATCHES "^\\[\(.+\)\\]$")
set(_v ${CMAKE_MATCH_1})
endif()
- message(STATUS "2. _v = ${_v}")
if(USE_POSIX_PACKAGING)
string(TOLOWER ${_v} ${_varname})
else()
foreach(_c_l ${_config_lines} )
if(_c_l MATCHES "^AC_INIT\\(\([^,]+\),\([^,]+\), *\\[\([^,]+\)\\] *,\(.*\)")
+ # Not using CMAKE_MATCH_ directly is needed, because
+ # its value is now changed inside macro setstripped
set(_PB ${CMAKE_MATCH_1})
set(_PV ${CMAKE_MATCH_2})
set(_PBU ${CMAKE_MATCH_3})
setstripped(PACKAGE_BASE ${_PB})
setstripped(PACKAGE_VERSION ${_PV})
setstripped(PACKAGE_BUGREPORT ${_PBU})
- if(PACKAGE_VERSION MATCHES "^\([0-9]+\)\\.\([0-9]+\)\(\\.\([0-9]+\)\)?.*$")
+ if(PACKAGE_VERSION MATCHES "^\([0-9]+\)\\.\([0-9]+\)\(\\.\([0-9]+\)\(\\.\([0-9]+\)\)?\)?.*$")
set(LYX_MAJOR_VERSION ${CMAKE_MATCH_1})
set(LYX_MINOR_VERSION ${CMAKE_MATCH_2})
- set(LYX_RELEASE_VERSION ${CMAKE_MATCH_4})
+ set(LYX_RELEASE_LEVEL ${CMAKE_MATCH_4})
+ set(LYX_RELEASE_PATCH ${CMAKE_MATCH_6})
set(LYX_DIR_VER "LYX_DIR_${CMAKE_MATCH_1}${CMAKE_MATCH_2}x")
set(LYX_USERDIR_VER "LYX_USERDIR_${CMAKE_MATCH_1}${CMAKE_MATCH_2}x")
+ if (NOT LYX_RELEASE_LEVEL)
+ set(LYX_RELEASE_LEVEL 0)
+ endif()
+ if (NOT LYX_RELEASE_PATCH)
+ set(LYX_RELEASE_PATCH 0)
+ endif()
if ("${LYX_SUFFIX_VALUE}" MATCHES "")
set(LYX_INSTALL_SUFFIX "${LYX_MAJOR_VERSION}.${LYX_MINOR_VERSION}")
else()
FIND_PROGRAM(LYX_GITVERSION git)
#message(STATUS "gitversion = ${LYX_GITVERSION}")
-set(LYX_REVISION_VERSION ${LYX_RELEASE_VERSION})
+set(LYX_REVISION_VERSION ${LYX_RELEASE_LEVEL})
set(LYX_PACKAGE_RELEASE "1")
if(LYX_GITVERSION)
if (LYX_LOCALVERSIONING)
- # Find the revision number and for later use
+ # Find the revision number for later use
EXECUTE_PROCESS(COMMAND ${LYX_GITVERSION} describe --match 2.0.0 HEAD
WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE tmp_LYX_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE)
if (tmp_LYX_PACKAGE_RELEASE MATCHES "^2\\.0\\.0\\-\([0-9]+\)\\-\(.*\)$")
# previous svn.
# We use this value than also to set the package-patch-value
MATH(EXPR tmp_REVISION_VERSION "(${CMAKE_MATCH_1}+40000)")
- set(LYX_REVISION_VERSION "${LYX_RELEASE_VERSION}-${tmp_REVISION_VERSION}git")
+ set(LYX_REVISION_VERSION "${LYX_RELEASE_LEVEL}-${tmp_REVISION_VERSION}git")
set(ENABLE_DIST ON)
endif()
endif()
+else()
+ if (LYX_RELEASE_PATCH GREATER 0)
+ set(LYX_REVISION_VERSION "${LYX_RELEASE_LEVEL}.${LYX_RELEASE_PATCH}")
+ endif()
endif()
# Set the programs (lyx, tex2lyx, etc.) suffix
message(STATUS " - library: ${HUNSPELL_LIBRARY}")
endif()
-foreach(_spell "ASPELL" "Enchant" "Hunspell")
+foreach(_spell "ASPELL" "ENCHANT" "HUNSPELL")
string(TOUPPER ${_spell} _upspell)
if (NOT ${_upspell}_FOUND)
find_package(${_spell})
unset(PYTHON_VERSION_MAJOR)
unset(PYTHON_VERSION_MINOR)
unset(PYTHON_VERSION_STRING)
-find_package(PythonInterp 3.3 QUIET)
-if(NOT PYTHONINTERP_FOUND)
- unset(PYTHON_EXECUTABLE CACHE)
- find_package(PythonInterp 2.0 REQUIRED)
- if(NOT PYTHON_VERSION_STRING VERSION_LESS 2.8)
- message(FATAL_ERROR "Python interpreter found, but is not suitable")
+if (CMAKE_VERSION VERSION_LESS "3.13")
+ find_package(PythonInterp 3.5 QUIET)
+ if(NOT PYTHONINTERP_FOUND)
+ find_package(PythonInterp 2.0 REQUIRED)
+ if(NOT PYTHON_VERSION_STRING VERSION_LESS 2.8)
+ message(FATAL_ERROR "Python interpreter found, but is not suitable")
+ endif()
+ endif()
+ set(LYX_PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE} CACHE FILEPATH "Python to be used by LyX")
+else()
+ find_package(Python3 3.5 QUIET)
+ if(NOT Python3_Interpreter_FOUND)
+ unset(PYTHON_EXECUTABLE CACHE)
+ find_package(Python2 2.0 REQUIRED)
+ if(NOT Python2_VERSION VERSION_LESS 2.8)
+ message(FATAL_ERROR "Python interpreter found, but is not suitable")
+ endif()
+ set(LYX_PYTHON_EXECUTABLE ${Python2_EXECUTABLE} CACHE FILEPATH "Python to be used by LyX")
+ else()
+ set(LYX_PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python to be used by LyX")
endif()
endif()
-set(LYX_PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE} CACHE FILEPATH "Python to be used by LyX")
-
if(LYX_NLS)
find_package(LyXGettext)
if(LYX_PYTHON_EXECUTABLE AND GETTEXT_FOUND)
projects / lyx.git / blobdiff