ctest update: we now work around a problem with Czech or Slovak text in some tables.

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e421c535b923aa8136cca2bd7751a26e5c1a9a67..f759d8f45bdeb314939bf5e1b75169b24cd2f2c2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,6 +81,14 @@ if(NOT help AND NOT HELP)
       message(FATAL_ERROR "Exiting")
     endif()
   endif()
+  # Enable LTO if supported and not debugging
+  if (POLICY CMP0069)
+    if (LYX_DEBUG)
+      cmake_policy(SET CMP0069 OLD)
+    else()
+      cmake_policy(SET CMP0069 NEW)
+    endif()
+  endif()
 endif()
 
 if(UNIX)
@@ -150,13 +158,12 @@ LYX_OPTION(EXTERNAL_HUNSPELL "OFF := Build 3rdparty lib hunspelllib" 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)
@@ -271,22 +278,29 @@ if(UNIX OR MINGW)
            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)
@@ -325,6 +339,9 @@ endif()
 macro(setstripped _varname)
        if(${ARGC} GREATER 1)
                string(STRIP "${ARGV1}" _v)
+                if (_v MATCHES "^\\[\(.+\)\\]$")
+                  set(_v ${CMAKE_MATCH_1})
+                endif()
                if(USE_POSIX_PACKAGING)
                        string(TOLOWER ${_v} ${_varname})
                else()
@@ -337,9 +354,14 @@ endmacro(setstripped)
 
 foreach(_c_l ${_config_lines} )
        if(_c_l MATCHES "^AC_INIT\\(\([^,]+\),\([^,]+\), *\\[\([^,]+\)\\] *,\(.*\)")
-               setstripped(PACKAGE_BASE ${CMAKE_MATCH_1})
-               setstripped(PACKAGE_VERSION ${CMAKE_MATCH_2})
-               setstripped(PACKAGE_BUGREPORT ${CMAKE_MATCH_3})
+                # 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]+\)\)?.*$")
                        set(LYX_MAJOR_VERSION ${CMAKE_MATCH_1})
                        set(LYX_MINOR_VERSION ${CMAKE_MATCH_2})
@@ -769,7 +791,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)