]> git.lyx.org Git - lyx.git/blobdiff - CMakeLists.txt
Amend 9b1dc338b2. Fix compilation in GCC 4.9
[lyx.git] / CMakeLists.txt
index dba07183376952ccaf1ab36503b5cb2b76d624a2..c9bde3e19ce606ef7cd3ac39109ed1c1b8497460 100644 (file)
@@ -2,11 +2,16 @@
 # Licence details can be found in the file COPYING.
 #
 # Copyright (c) 2006-2011 Peter Kümmel, <syntheticpp@gmx.net>
-# Copyright (c) 2008-2011 Kornel Benko, <Kornel.Benko@berlin.de>
+# Copyright (c) 2008-2020 Kornel Benko, <Kornel.Benko@berlin.de>
 
-cmake_minimum_required(VERSION 2.6.4)
+cmake_minimum_required(VERSION 3.1.0)
+
+set(GNUWIN32_DIR D:/LyX/lyx-unstable/lyx-windows-deps-msvc2017)
 
 set(LYX_PROJECT LyX)
+# Instruct cmake to not use gnu extensions,
+# this prevents the mix of '-std=c++*' and '-std=gnu++*' flags
+set(CMAKE_CXX_EXTENSIONS OFF)
 
 enable_testing()
 
@@ -37,20 +42,19 @@ set(LYX_TESTS_USERDIR "${TOP_BINARY_DIR}/Testing/.lyx")
 file(MAKE_DIRECTORY "${LYX_TESTS_USERDIR}")
 
 if(COMMAND cmake_policy)
-       cmake_policy(SET CMP0003 OLD)
-       cmake_policy(SET CMP0005 OLD)
        # Installing MACOSX_BUNDLE targets requires a BUNDLE DESTINATION
        cmake_policy(SET CMP0006 NEW)
-       if(POLICY CMP0020)
-               cmake_policy(SET CMP0020 OLD)
-       endif()
-       if(POLICY CMP0028)
-               cmake_policy(SET CMP0028 OLD)
-       endif()
        if(POLICY CMP0043)
                # COMPILE_DEFINITIONS are not used yet. Enable new behavior.
                cmake_policy(SET CMP0043 NEW)
        endif()
+       cmake_policy(SET CMP0020 NEW)
+       if(POLICY CMP0075)
+               cmake_policy(SET CMP0075 NEW)
+       endif()
+       if(POLICY CMP0077)
+               cmake_policy(SET CMP0077 NEW)
+       endif()
 endif()
 
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
@@ -102,6 +106,34 @@ endif()
 include(LyXMacros)
 include(LyXDestinations)
 
+# Try to get some informations from configure.ac
+include(LyXPaths)
+
+# Value of USE_POSIX_PACKAGING is needed in determineversionandbuildtype()
+if(WIN32)
+       set(CMAKE_PREFIX_PATH Specify-path-to-Qt CACHE PATH "Used Qt version")
+       if(MSVC)
+               set(LYX_3RDPARTY_BUILD ON CACHE BOOL "Build 3rdparty libraries" FORCE)
+       endif()
+       set(USE_WINDOWS_PACKAGING ON)
+elseif(APPLE)
+       set(USE_MACOSX_PACKAGING ON)
+else()
+       set(USE_POSIX_PACKAGING ON)
+endif()
+
+determineversionandbuildtype("${TOP_SRC_DIR}/configure.ac" _package_list _version_list _envlist LYX_DATE LYX_BUILD_TYPE)
+list(GET _package_list 0 PACKAGE_BASE)
+list(GET _package_list 1 PACKAGE_VERSION)
+list(GET _package_list 2 PACKAGE_BUGREPORT)
+list(GET _envlist 0 LYX_DIR_VER)
+list(GET _envlist 1 LYX_USERDIR_VER)
+list(GET _version_list 0 LYX_VERSION)
+list(GET _version_list 1 LYX_MAJOR_VERSION)
+list(GET _version_list 2 LYX_MINOR_VERSION)
+list(GET _version_list 3 LYX_RELEASE_LEVEL)
+list(GET _version_list 4 LYX_RELEASE_PATCH)
+
 # Usage LYX_OPTION
 # 1. parameter: option name without prefix 'LYX_'
 # 2. parameter: description
@@ -115,6 +147,49 @@ include(LyXDestinations)
 # 4-n parameter: possible other string values
 
 LYX_OPTION_INIT()
+LYX_COMBO(ENABLE_BUILD_TYPE  "Allows to tweak the compiled code" AUTO release prerelease development gprof)
+
+if(LYX_ENABLE_BUILD_TYPE MATCHES "AUTO")
+  message(STATUS "Selecting build type defaults from configure.ac")
+else()
+  set(LYX_BUILD_TYPE "${LYX_ENABLE_BUILD_TYPE}")
+  message(STATUS "Selecting build type defaults from LYX_ENABLE_BUILD_TYPE")
+endif()
+
+# Select some defaults depending on LYX_BUILD_TYPE
+# they can always be overwritten by the respective command line settings
+# These settings are only effective on fresh(==empty) CMakeCache.txt
+if(LYX_BUILD_TYPE STREQUAL "development")
+  set(DefaultLyxDebug ON)
+  set(DefaultLyxRelease OFF)
+  set(DefaultLyxStdlibDebug ON)
+  set(DefaultLyxEnableAssertions ON)
+  set(DefaultLyxProfile OFF)
+  set(DefaultExternalLibs OFF)
+elseif(LYX_BUILD_TYPE STREQUAL "prerelease")
+  set(DefaultLyxDebug OFF)
+  set(DefaultLyxRelease OFF)
+  set(DefaultLyxStdlibDebug OFF)
+  set(DefaultLyxEnableAssertions OFF)
+  set(DefaultLyxProfile OFF)
+  set(DefaultExternalLibs ON)
+elseif(LYX_BUILD_TYPE STREQUAL "release")
+  set(DefaultLyxDebug OFF)
+  set(DefaultLyxRelease ON)
+  set(DefaultLyxStdlibDebug OFF)
+  set(DefaultLyxEnableAssertions OFF)
+  set(DefaultLyxProfile OFF)
+  set(DefaultExternalLibs ON)
+elseif(LYX_BUILD_TYPE STREQUAL "gprof")
+  set(DefaultLyxDebug ON)
+  set(DefaultLyxRelease OFF)
+  set(DefaultLyxStdlibDebug OFF)
+  set(DefaultLyxEnableAssertions OFF)
+  set(DefaultLyxProfile ON)
+  set(DefaultExternalLibs OFF)
+else()
+  message(FATAL_ERROR "Invalid build type (${LYX_BUILD_TYPE}) encountered")
+endif()
 
 # Options for all compilers/systems
 LYX_OPTION(CPACK            "Use the CPack management (Implies LYX_INSTALL option)" OFF ALL)
@@ -125,10 +200,10 @@ LYX_OPTION(REQUIRE_SPELLCHECK "Abort if no spellchecker available" OFF ALL)
 LYX_OPTION(ASPELL           "Require aspell" OFF ALL)
 LYX_OPTION(ENCHANT          "Require Enchant" OFF ALL)
 LYX_OPTION(HUNSPELL         "Require Hunspell" OFF ALL)
-LYX_OPTION(DEVEL_VERSION    "Build developer version" OFF ALL)
-LYX_OPTION(RELEASE          "Build release version, build debug when disabled" OFF ALL)
-LYX_OPTION(DEBUG            "Enforce debug build"  OFF ALL)
+LYX_OPTION(RELEASE          "Build release version, build debug when disabled" ${DefaultLyxRelease} ALL)
+LYX_OPTION(DEBUG            "Enforce debug build"  ${DefaultLyxDebug} ALL)
 LYX_OPTION(NO_OPTIMIZE      "Don't use any optimization/debug flags"  OFF ALL)
+LYX_OPTION(ENABLE_ASSERTIONS "Run sanity checks in the program"  ${DefaultLyxEnableAssertions} ALL)
 LYX_OPTION(PACKAGE_SUFFIX   "Use version suffix for packaging" ON ALL)
 LYX_STRING(SUFFIX_VALUE     "Use this string as suffix" "")
 LYX_OPTION(PCH              "Use precompiled headers" OFF ALL)
@@ -140,25 +215,35 @@ LYX_OPTION(BUNDLE           "Build bundle  (experimental) " OFF ALL)
 LYX_OPTION(ENABLE_URLTESTS  "Enable for URL tests" OFF ALL)
 LYX_OPTION(ENABLE_EXPORT_TESTS "Enable for export tests" OFF ALL)
 LYX_OPTION(ENABLE_KEYTESTS  "Enable for keytests" OFF ALL)
+if (NOT CMAKE_VERSION VERSION_LESS "3.17")
+  LYX_OPTION(ENABLE_VALGRIND_TESTS  "Enable for tests involving valgrind" OFF ALL)
+else()
+  if (LYX_ENABLE_VALGRIND_TESTS)
+    unset(LYX_ENABLE_VALGRIND_TESTS CACHE)
+  endif()
+endif()
 LYX_OPTION(ASAN             "Use address sanitizer" OFF ALL)
-LYX_COMBO(USE_QT            "Use Qt version as frontend" QT4 QT5)
+#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(EXTERNAL_Z       "OFF := Build 3rdparty lib zlib" ON ALL)
-LYX_OPTION(EXTERNAL_ICONV   "OFF := Build 3rdparty lib iconvlib" ON ALL)
-LYX_OPTION(EXTERNAL_HUNSPELL "OFF := Build 3rdparty lib hunspelllib" ON ALL)
+LYX_OPTION(DISABLE_CALLSTACK_PRINTING "do not print a callstack when crashing" OFF ALL)
+LYX_OPTION(EXTERNAL_Z       "OFF := Build 3rdparty lib zlib" ${DefaultExternalLibs} ALL)
+LYX_OPTION(EXTERNAL_DTL     "OFF := Build 3rdparty commands dt2dv and dv2dt" ${DefaultExternalLibs} ALL)
+LYX_OPTION(EXTERNAL_ICONV   "OFF := Build 3rdparty lib iconvlib" ${DefaultExternalLibs} ALL)
+LYX_OPTION(EXTERNAL_HUNSPELL "OFF := Build 3rdparty lib hunspelllib" ${DefaultExternalLibs} 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(EXTERNAL_BOOST       "Use external boost" OFF GCC)
+LYX_OPTION(PROFILE              "Build with options for gprof" ${DefaultLyxProfile} GCC)
+LYX_OPTION(EXTERNAL_BOOST       "Use external boost" ${DefaultExternalLibs} 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)
+LYX_OPTION(STDLIB_DEBUG         "Use debug stdlib" ${DefaultLyxStdlibDebug} GCC)
 
 # MSVC specific
-LYX_OPTION(CONSOLE               "Show console on Windows, enforce with =FORCE" ON MSVC)
+LYX_OPTION(CONSOLE               "Show console on Windows" ON MSVC)
 LYX_OPTION(VLD                   "Use VLD with MSVC" OFF MSVC)
 LYX_OPTION(WALL                  "Enable all warnings" OFF MSVC)
 LYX_OPTION(DEPENDENCIES_DOWNLOAD "Download dependencies for MSVC 10" OFF MSVC)
@@ -174,10 +259,29 @@ if(help OR HELP)
        message(STATUS)
        LYX_OPTION_LIST_ALL(help)
        message(STATUS)
+       unset(help CACHE)
+       unset(HELP CACHE)
        RETURN()
 endif()
 
+if ("${LYX_SUFFIX_VALUE}" MATCHES "")
+  set(LYX_INSTALL_SUFFIX "${LYX_MAJOR_VERSION}.${LYX_MINOR_VERSION}")
+else()
+  set(LYX_INSTALL_SUFFIX "${LYX_SUFFIX_VALUE}")
+endif()
+
 # Check option dependencies
+if (LYX_ENABLE_VALGRIND_TESTS)
+       find_program(VALGRIND_EXECUTABLE "valgrind")
+       if (NOT VALGRIND_EXECUTABLE)
+               message(FATAL_ERROR "Cannot use valgrind tests, executable valgrind is missing. Please disable LYX_ENABLE_VALGRIND_TESTS")
+       endif()
+endif()
+if (LYX_DEBUG_GLIBC OR LYX_DEBUG_GLIBC_PEDANTIC OR LYX_STDLIB_DEBUG)
+  if (LYX_EXTERNAL_BOOST)
+    message(FATAL_ERROR "Using external boost not compatible with debug mode for stdlib")
+  endif()
+endif()
 
 if(LYX_DMG)
        set(LYX_BUNDLE ON)
@@ -193,11 +297,6 @@ if(LYX_INSTALL)
         if(WIN32 AND NOT MINGW)
                set(LYX_HUNSPELL ON)
        endif()
-       if(LYX_CONSOLE MATCHES "FORCE")
-               set(LYX_CONSOLE ON)
-       else()
-               set(LYX_CONSOLE OFF)
-       endif()
        set(LYX_PACKAGE_SUFFIX ON)
        if(NOT LYX_DEBUG)
                set(LYX_RELEASE ON)
@@ -246,8 +345,6 @@ if(LYX_DEPENDENCIES_DOWNLOAD)
        endforeach()
 endif()
 
-
-
 message(STATUS)
 
 set(EXECUTABLE_OUTPUT_PATH  ${TOP_BINARY_DIR}/bin)
@@ -257,15 +354,33 @@ else()
        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)
 if(NOT CXX11COMPILER_FOUND)
        message(FATAL_ERROR "A C++11 compatible compiler is required.")
 endif()
-set(LYX_GCC11_MODE)
+unset(LYX_GCC11_MODE)
 if(UNIX OR MINGW)
-       if (CMAKE_CXX_COMPILER_ID MATCHES "^[cC]lang$")
+       if (CMAKE_CXX_COMPILER_ID MATCHES "^([cC]lang|AppleClang)$")
          # ignore the GCC_VERSION for clang
          # and use the resulting CXX11_STD_REGEX found in FindCXX11Compiler.cmake
          message(STATUS "Using clang")
@@ -275,45 +390,33 @@ 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()
-       set(LYX_USE_STD_REGEX 0)
-#      if(MSVC10)
-#              set(LYX_USE_STD_REGEX 1) #TODO should we use it in ECMAScript mode?
-#      endif()
-endif()
-
-
-set(VERSION_INFO "CMake Build")
-
-# Try to get some informations from configure.ac
-
-include(LyXPaths)
-file(STRINGS "${TOP_SRC_DIR}/configure.ac" _config_lines)
-
-if(WIN32)
-       set(CMAKE_PREFIX_PATH Specify-path-to-Qt CACHE PATH "Used Qt version")
-       if(MSVC)
-               set(LYX_3RDPARTY_BUILD ON CACHE BOOL "Build 3rdparty libraries" FORCE)
+       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)
        endif()
-       set(USE_WINDOWS_PACKAGING ON)
-elseif(APPLE)
-       set(USE_MACOSX_PACKAGING ON)
-else()
-       set(USE_POSIX_PACKAGING ON)
 endif()
 
 if(LYX_3RDPARTY_BUILD)
@@ -325,60 +428,38 @@ if(LYX_3RDPARTY_BUILD)
   set(LYX_EXTERNAL_MYTHES   OFF CACHE STRING "Build 3rdparty mytheslib" FORCE)
 endif()
 
-macro(setstripped _varname)
-       if(${ARGC} GREATER 1)
-               string(STRIP "${ARGV1}" _v)
-               if(USE_POSIX_PACKAGING)
-                       string(TOLOWER ${_v} ${_varname})
-               else()
-                       set(${_varname} ${_v})
-               endif()
-       else()
-               set(${_varname})
-       endif()
-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})
-               if(PACKAGE_VERSION MATCHES "^\([0-9]+\)\\.\([0-9]+\)\(\\.\([0-9]+\)\)?.*$")
-                       set(LYX_MAJOR_VERSION ${CMAKE_MATCH_1})
-                       set(LYX_MINOR_VERSION ${CMAKE_MATCH_2})
-                       set(LYX_PATCH_VERSION ${CMAKE_MATCH_4})
-                       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 ("${LYX_SUFFIX_VALUE}" MATCHES "")
-                         set(LYX_INSTALL_SUFFIX "${LYX_MAJOR_VERSION}.${LYX_MINOR_VERSION}")
-                       else()
-                         set(LYX_INSTALL_SUFFIX "${LYX_SUFFIX_VALUE}")
-                       endif()
-               endif()
-       endif()
-       if(_c_l MATCHES "^AC_SUBST\\( *LYX_DATE *, *\\[\\\"(.*)\\\"\\].*")
-               set(LYX_DATE "${CMAKE_MATCH_1}")
-       endif()
-endforeach(_c_l)
-
 FIND_PROGRAM(LYX_GITVERSION git)
 #message(STATUS "gitversion = ${LYX_GITVERSION}")
-set(LYX_REVISION_VERSION ${LYX_PATCH_VERSION})
+set(LYX_REVISION_VERSION ${LYX_RELEASE_LEVEL})
+set(LYX_PACKAGE_RELEASE "UNDEFINED")
 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 LYX_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if (LYX_PACKAGE_RELEASE MATCHES "^2\\.0\\.0\\-\([0-9]+\)\\-.*$")
-      # We will add offset of 40000 to get appropriate value to
-      # 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_PATCH_VERSION}-${tmp_REVISION_VERSION}git")
-      set(ENABLE_DIST ON)
+      WORKING_DIRECTORY "${TOP_SRC_DIR}"
+      RESULT_VARIABLE tmp_GIT_RESULT
+      OUTPUT_VARIABLE tmp_LYX_PACKAGE_RELEASE
+      ERROR_VARIABLE tmp_GIT_ERROR
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if (tmp_GIT_RESULT EQUAL 0)
+      if (tmp_LYX_PACKAGE_RELEASE MATCHES "^2\\.0\\.0\\-\([0-9]+\)\\-\(.*\)$")
+       set(LYX_PACKAGE_RELEASE ${CMAKE_MATCH_2})
+       # We will add offset of 40000 to get appropriate value to
+       # 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_LEVEL}-${tmp_REVISION_VERSION}git")
+       set(ENABLE_DIST ON)
+      endif()
     endif()
   endif()
 endif()
+if (LYX_PACKAGE_RELEASE MATCHES "UNDEFINED")
+  set(LYX_PACKAGE_RELEASE  "1")
+  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
 # When building an OS X bundle, we will append
@@ -389,6 +470,7 @@ if(LYX_PROGRAM_SUFFIX AND NOT (APPLE AND LYX_BUNDLE))
 endif()
 set(_lyx "${PACKAGE_BASE}${PROGRAM_SUFFIX}")
 set(_tex2lyx tex2lyx${PROGRAM_SUFFIX})
+set(_convert lyxconvert${PROGRAM_SUFFIX})
 
 add_custom_target(lyx_version ALL
   COMMAND ${CMAKE_COMMAND} -DTOP_SRC_DIR=${TOP_SRC_DIR} -DTOP_CMAKE_PATH=${TOP_CMAKE_PATH} -DTOP_BINARY_DIR=${TOP_BINARY_DIR} -DLYX_DATE=${LYX_DATE} -P ${TOP_SCRIPT_PATH}/LyXGetVersion.cmake
@@ -421,8 +503,8 @@ if(LYX_BUNDLE)
                set(OSX_BUNDLE_DIRS "Resources;Resources;Resources")
 
                # Process Info.plist and lyxrc.dist
+               # See development/cmake/Install.cmake
                configure_file("${CMAKE_CURRENT_SOURCE_DIR}/development/MacOSX/Info.plist.in" "${CMAKE_CURRENT_BINARY_DIR}/Info.plist")
-               configure_file("${CMAKE_CURRENT_SOURCE_DIR}/development/MacOSX/lyxrc.dist.in" "${CMAKE_CURRENT_BINARY_DIR}/lyxrc.dist")
 
                set(LYX_BUILD_BUNDLE MACOSX_BUNDLE)
                set(LYX_DATA_SUBDIR ${LYX_BUNDLE_NAME}.app/Contents/Resources/ CACHE STRING "Bundle Contents dir" FORCE)
@@ -463,14 +545,25 @@ else()
   set(SYSTEM_DATADIR "${CMAKE_INSTALL_PREFIX}")
 endif()
 
-# The define below allows lyx-executable to find its default configuration files
+if(NOT CMAKE_COMPILER_IS_GNUCXX)
+  # Not a GCC compiler, programs do not have a suffix
+  set(suffixing ${LYX_PACKAGE_SUFFIX})
+elseif(WIN32 AND MINGW)
+  # We want to use a suffix for the package in this case,
+  # even if not for the program
+  set(suffixing ${LYX_PACKAGE_SUFFIX})
+else()
+  message(STATUS "CMAKE_COMPILER_IS_GNUCXX = ${CMAKE_COMPILER_IS_GNUCXX}")
+  set(suffixing ${LYX_PROGRAM_SUFFIX})
+endif()
+
+# The define PACKAGE below allows lyx-executable to find its default configuration files
 # see routines
 #    Package::messages_file()
 #    get_default_user_support_dir()
 #    relative_system_support_dir()
 # in src/support/Package.cpp
-#
-if(LYX_PROGRAM_SUFFIX)
+if(suffixing)
        set(PACKAGE ${PACKAGE_BASE}${LYX_INSTALL_SUFFIX})
 else()
        set(PACKAGE ${PACKAGE_BASE})
@@ -503,31 +596,38 @@ if(NOT LYX_DATA_SUBDIR)
        endif()
 endif()
 
-set(LYX_ABS_INSTALLED_DATADIR "${CMAKE_INSTALL_PREFIX}")
+set(LYX_ABS_INSTALLED_DATADIR "${CMAKE_INSTALL_PREFIX}/${LYX_DATA_SUBDIR}")
 get_locale_destination(LYX_LOCALEDIR)
 set(LYX_ABS_INSTALLED_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/${LYX_LOCALEDIR}")
 set(LYX_ABS_TOP_SRCDIR "${TOP_SRC_DIR}")
 
 if(LYX_BUNDLE AND APPLE)
-       set(LYX_MAN_DIR "${LYX_DATA_SUBDIR}" CACHE STRING "Install location for man pages.")
+       set(LYX_MAN_DIR_tmp "${LYX_DATA_SUBDIR}")
 else()
        if(WIN32)
-               set(LYX_MAN_DIR "${CMAKE_BINARY_DIR}/usr/local/man" CACHE STRING "Install location for man pages.")
+               set(LYX_MAN_DIR_tmp "${CMAKE_BINARY_DIR}/usr/local/man/")
        elseif(UNIX)
-               set(LYX_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE STRING "Install location for man pages.")
+               set(LYX_MAN_DIR_tmp "${CMAKE_INSTALL_PREFIX}/share/man/")
        else()
-               set(LYX_MAN_DIR "${CMAKE_INSTALL_PREFIX}/man" CACHE STRING "Install location for man pages.")
+               set(LYX_MAN_DIR_tmp "${CMAKE_INSTALL_PREFIX}/man/")
        endif()
 endif()
+if (NOT LYX_MAN_DIR_tmp EQUAL "${LYX_MAN_DIR}")
+       unset(LYX_MAN_DIR CACHE)
+       set(LYX_MAN_DIR "${LYX_MAN_DIR_tmp}" CACHE STRING "Install location for man pages.")
+endif()
+unset(LYX_MAN_DIR_tmp)
 mark_as_advanced(LYX_MAN_DIR)
 
-if(LYX_INSTALL AND WIN32)
-       message(STATUS "Configuring NSIS files")
-       configure_file(development/Win32/packaging/installer/lyx.nsi.cmake ${CMAKE_BINARY_DIR}/installer/lyx.nsi @ONLY)
-       configure_file(development/Win32/packaging/installer/settings.nsh.cmake ${CMAKE_BINARY_DIR}/installer/settings-cmake.nsh @ONLY)
-       configure_file(development/Win32/packaging/installer/include/declarations.nsh.cmake ${CMAKE_BINARY_DIR}/installer/declarations-cmake.nsh @ONLY)
-       message(STATUS "NSIS files are created in ${CMAKE_BINARY_DIR}/installer")
-endif()
+# The Win installer cannot be built by CMake because one needs to install plugins for NSIS
+# see the Readme.txt of the installer
+#if(LYX_INSTALL AND WIN32)
+#      message(STATUS "Configuring NSIS files")
+#      configure_file(development/Win32/packaging/installer/lyx.nsi.cmake ${CMAKE_BINARY_DIR}/installer/lyx.nsi @ONLY)
+#      configure_file(development/Win32/packaging/installer/settings.nsh.cmake ${CMAKE_BINARY_DIR}/installer/settings-cmake.nsh @ONLY)
+#      configure_file(development/Win32/packaging/installer/include/declarations.nsh.cmake ${CMAKE_BINARY_DIR}/installer/declarations-cmake.nsh @ONLY)
+#      message(STATUS "NSIS files are created in ${CMAKE_BINARY_DIR}/installer")
+#endif()
 
 if(NOT GROUP_CODE)
        #set(GROUP_CODE "The Golden Code")
@@ -543,7 +643,7 @@ include(ProjectSourceGroup)
 
 
 if(LYX_PROFILE AND NOT MSVC)
-       set(CMAKE_BUILD_TYPE Profile CACHE TYPE STRING FORCE)
+       set(CMAKE_BUILD_TYPE Profile CACHE STRING "Profile build type" FORCE)
        set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE} -pg")
        set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS}  -pg")
 else()
@@ -577,31 +677,67 @@ else()
        set(library_type STATIC)
 endif()
 
-if(NOT MSVC)
+if(LYX_ENABLE_ASSERTIONS)
+  set(LYX_CXX_FLAGS " -DENABLE_ASSERTIONS=1")
+else()
+  set(LYX_CXX_FLAGS "")
+endif()
+
+if(MSVC)
+  if (CXX11_FLAG MATCHES "\\+\\+([0-9]+)")
+    set(CMAKE_CXX_STANDARD ${CMAKE_MATCH_1})
+    message(STATUS "CMAKE_CXX_STANDARD set to ${CMAKE_CXX_STANDARD}")
+  endif()
+  set(CMAKE_CXX_FLAGS       "${CMAKE_CXX_FLAGS}${LYX_CXX_FLAGS}")
+else()
        if(NOT LYX_QUIET)
                set(CMAKE_VERBOSE_MAKEFILE ON)
        endif()
-       set(LYX_CXX_FLAGS "-Wall -Wunused-parameter ${LYX_GCC11_MODE}")
-       if(LYX_CXX_FLAGS MATCHES "\\+\\+(14|11|98)")
+       if(LYX_GCC11_MODE MATCHES "\\+\\+([0-9][0-9])")
          # Thanks to Brad King <brad.king@kitware.com>
          # for the pointer to https://cmake.org/cmake/help/v3.6/variable/CMAKE_CXX_STANDARD.html
          # This allows us to use QT5.7 with recent g++ (version >= 4.9) compilers
          # and still use our own c++ extension tests
-         set(CMAKE_CXX_STANDARD ${CMAKE_MATCH_1})
-         message(STATUS "CMAKE_CXX_STANDARD set to ${CMAKE_CXX_STANDARD}")
+         set(std_num ${CMAKE_MATCH_1})
+         set(CMAKE_CXX_STANDARD ${std_num})
+       else()
+         message(STATUS "Setting CMAKE_CXX_STANDARD 11 as fallback")
+         set(CMAKE_CXX_STANDARD 11)
+         set(LYX_GCC11_MODE "--std=c++11")
        endif()
+       # The following setting with LYX_GCC11_MODE is needed because cmake does not honor
+       # CMAKE_CXX_STANDARD while performing tests like
+       # check_cxx_source_compiles("..." HAVE_DEF_MAKE_UNIQUE)
+       set(LYX_CXX_FLAGS "-Wall -Wunused-parameter ${LYX_GCC11_MODE}${LYX_CXX_FLAGS}")
        if(LYX_STDLIB_DEBUG)
-               set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC")
+         set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC")
+        else()
+          if(LYX_DEBUG_GLIBC)
+            set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCXX_DEBUG")
+          endif()
+          if(LYX_DEBUG_GLIBC_PEDANTIC)
+            set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCXX_DEBUG_PEDANTIC")
+          endif()
        endif()
-       set(CMAKE_CXX_FLAGS       "${LYX_CXX_FLAGS} -fno-strict-aliasing " CACHE TYPE STRING FORCE)
-       set(CMAKE_CXX_FLAGS_DEBUG "${LYX_CXX_FLAGS} -fno-strict-aliasing -O0 -g3 -D_DEBUG" CACHE TYPE STRING FORCE)
+       set(CMAKE_CXX_FLAGS       "${LYX_CXX_FLAGS} -fno-strict-aliasing " CACHE STRING "Set CXX flags" FORCE)
+       set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -D_DEBUG" CACHE STRING "Set debug flags" FORCE)
        if(MINGW)
-               set(CMAKE_CXX_FLAGS_RELEASE "${LYX_CXX_FLAGS} -O2 -DNDEBUG" CACHE TYPE STRING FORCE)
+               set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG" CACHE STRING "Set release flags for Mingw" FORCE)
        else()
-               set(CMAKE_CXX_FLAGS_RELEASE "${LYX_CXX_FLAGS} -O3 -DNDEBUG" CACHE TYPE STRING FORCE)
+               set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "Set release flags" FORCE)
        endif()
 endif()
 
+if(LYX_ASAN)
+    set(CMAKE_CXX_FLAGS "-fsanitize=address -fno-omit-frame-pointer -g ${CMAKE_CXX_FLAGS}")
+    message(STATUS)
+    message(STATUS "Address sanitizer enabled. Usage:")
+    message(STATUS "    wget https://llvm.org/svn/llvm-project/compiler-rt/trunk/lib/asan/scripts/asan_symbolize.py")
+    message(STATUS "    chmod  +x ./asan_symbolize.py")
+    message(STATUS "    ./bin/${_lyx} 2>&1 | ./asan_symbolize.py  | c++filt ")
+    message(STATUS)
+endif()
+
 set(LYX_CXX_FLAGS_EXTRA "" CACHE STRING "Desired semicolon separated list of extra cxx compile flags, like '-Werror'")
 mark_as_advanced(LYX_CXX_FLAGS_EXTRA)
 if(LYX_CXX_FLAGS_EXTRA)
@@ -614,29 +750,49 @@ if(LYX_XMINGW)
        list(APPEND CMAKE_FIND_ROOT_PATH ${GNUWIN32_DIR})
 endif()
 
+set(min_qt5_version "5.6")
+if(LYX_USE_QT MATCHES "AUTO")
+       # try qt5 first
+       find_package(Qt5Core CONFIG QUIET)
+       if(Qt5Core_FOUND)
+               set(LYX_USE_QT "QT5" CACHE STRING "Valid qt version" FORCE)
+               message(STATUS "Qt5Core_VERSION = ${Qt5Core_VERSION}")
+               if(Qt5Core_VERSION VERSION_LESS ${min_qt5_version})
+                       find_package(Qt4 "4.5.0" QUIET)
+                       if(QT4_FOUND)
+                               set(LYX_USE_QT "QT4" CACHE STRING "Valid qt version" FORCE)
+                       endif()
+               endif()
+       else()
+               set(LYX_USE_QT "QT4" CACHE STRING "Valid qt version" FORCE)
+       endif()
+endif()
 if(LYX_USE_QT MATCHES "QT5")
        # set QPA_XCB if QT uses X11
-       find_package(Qt5Core REQUIRED)
+       find_package(Qt5Core CONFIG REQUIRED)
        if (Qt5Core_FOUND)
-               find_package(Qt5Widgets REQUIRED)
+               find_package(Qt5Widgets CONFIG REQUIRED)
                if(APPLE)
-                       find_package(Qt5MacExtras REQUIRED)
+                       find_package(Qt5MacExtras CONFIG REQUIRED)
                endif()
-               find_package(Qt5X11Extras QUIET)
-               find_package(Qt5WinExtras QUIET)
+               find_package(Qt5X11Extras CONFIG QUIET)
+               find_package(Qt5WinExtras CONFIG QUIET)
                set(QTVERSION ${Qt5Core_VERSION})
-               if (QTVERSION VERSION_LESS "5.4")
+               if (QTVERSION VERSION_LESS ${min_qt5_version})
                        message(STATUS "QTVERSION = \"${QTVERSION}\"")
                        message(STATUS "This version is not recommended, try either option -DLYX_USE_QT=QT4 or")
-                       message(STATUS "install QT-Version >= \"5.4\"")
+                       message(STATUS "install QT-Version >= \"${min_qt5_version}\"")
                        # see thread in lyx-devel list
                        # From: Jean-Pierre Chrétien <jeanpierre.chretien@free.fr>
                        # Date 11.03.2017
                        # Subject: cmake compilation error
                        #message(FATAL_ERROR "Wrong Qt-Version")
                endif()
-               macro (qt_use_modules)
-                       qt5_use_modules(${ARGN})
+               macro (qt_use_modules lyxtarget)
+                       foreach (_tg ${ARGN})
+                               find_package(Qt5${_tg} CONFIG REQUIRED)
+                               target_link_libraries(${lyxtarget} Qt5::${_tg})
+                       endforeach()
                endmacro()
                macro (qt_add_resources)
                        qt5_add_resources(${ARGN})
@@ -673,7 +829,8 @@ endif()
 
 find_package(Magic)
 if(Magic_FOUND)
-       set(HAVE_MAGIC_H 1)
+  set(HAVE_MAGIC_H 1)
+  include_directories(${Magic_INCLUDE_DIR})
 endif()
 
 include_directories(${TOP_BINARY_DIR} ${TOP_SRC_DIR}/src)
@@ -683,7 +840,7 @@ set(Include_used_spellchecker)   # String will be inserted into config.h
 
 if (LYX_EXTERNAL_MYTHES MATCHES "AUTO")
   # try system library first
-  find_package(MyThesLIB)
+  find_package(MYTHESLIB)
   if (MYTHESLIB_FOUND)
     set(LYX_EXTERNAL_MYTHES ON CACHE STRING "OFF:= Build 3rdparty mytheslib" FORCE)
   else()
@@ -691,7 +848,7 @@ if (LYX_EXTERNAL_MYTHES MATCHES "AUTO")
   endif()
 endif()
 if (LYX_EXTERNAL_MYTHES MATCHES "ON")
-  find_package(MyThesLIB REQUIRED)
+  find_package(MYTHESLIB REQUIRED)
 else()
   add_subdirectory(3rdparty/mythes)
 endif()
@@ -706,7 +863,7 @@ if(NOT LYX_EXTERNAL_HUNSPELL)
     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})
@@ -729,23 +886,35 @@ if(GNUWIN32_DIR)
        list(APPEND CMAKE_PROGRAM_PATH "${GNUWIN32_DIR}/Python" )
 endif()
 
-find_package(PythonInterp 2.7 QUIET)
-if(PYTHONINTERP_FOUND)
-       if(PYTHON_VERSION_STRING VERSION_GREATER 2.8)
-       unset(PYTHONINTERP_FOUND)
-       endif()
-endif()
-
-if(NOT PYTHONINTERP_FOUND)
-  unset(PYTHON_EXECUTABLE CACHE)
-  unset(PYTHON_VERSION_MAJOR)
-  unset(PYTHON_VERSION_MINOR)
-  unset(PYTHON_VERSION_STRING)
-  find_package(PythonInterp 3.3 REQUIRED)
+# Search for python default version first
+unset(PYTHON_EXECUTABLE CACHE)
+unset(LYX_PYTHON_EXECUTABLE CACHE)
+unset(PYTHON_VERSION_MAJOR)
+unset(PYTHON_VERSION_MINOR)
+unset(PYTHON_VERSION_STRING)
+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)
@@ -762,6 +931,8 @@ if(LYX_NLS)
 endif()
 
 if(LYX_EXTERNAL_ICONV)
+  # Possible remnants of previous run without external iconv
+  file(REMOVE_RECURSE "${CMAKE_BINARY_DIR}/libiconv" "${CMAKE_BINARY_DIR}/3rdparty/libiconv")
   find_package(ICONV REQUIRED)
 else()
   add_subdirectory(3rdparty/libiconv)
@@ -774,36 +945,44 @@ else()
   add_subdirectory(3rdparty/zlib)
 endif()
 
-if(LYX_EXTERNAL_BOOST)
-       message(STATUS "Searching for boost")
-       if(NOT LYX_USE_STD_REGEX)
-               find_package(Boost COMPONENTS regex)
-       endif()
-       if(Boost_FOUND)
-               message(STATUS "Boost found")
-               message(STATUS "Boost-libs = ${Boost_LIBRARIES}")
-               set(Lyx_Boost_Libraries ${Boost_LIBRARIES})
-               if (LYX_STDLIB_DEBUG)
-                       # Comment from  Jean-Marc Lasgouttes:
-                       # In general, system boost libraries are incompatible with
-                       # the use of stdlib-debug in libstdc++. See ticket #9736 for
-                       # details.
-                       message(WARNING "Compiling LyX with stdlib-debug and system boost libraries may lead to crashes. Consider using '-DLYX_STDLIB_DEBUG=OFF' or using '-DLYX_EXTERNAL_BOOST=OFF'")
-               endif()
-       else()
-               message(FATAL_ERROR "Boost not found" ${Boost_ERROR_REASON})
-       endif()
-else()
-       if(NOT LYX_USE_STD_REGEX)
-               set(Lyx_Boost_Libraries boost_regex)
-       endif()
-       add_definitions(-DBOOST_USER_CONFIG="<config.h>")
-       include_directories(${TOP_SRC_DIR}/3rdparty/boost)
-       add_subdirectory(3rdparty/boost "${TOP_BINARY_DIR}/3rdparty/boost")
+if(NOT LYX_EXTERNAL_DTL)
+  add_subdirectory(3rdparty/dtl)
 endif()
 
-
-
+if(LYX_USE_STD_REGEX)
+  # Set only include path.
+  # Use internal boost, which is known to exist
+  # we don't need any libraries
+  set(Lyx_Boost_Libraries)
+  add_definitions(-DBOOST_USER_CONFIG=<config.h>)
+  include_directories(${TOP_SRC_DIR}/3rdparty/boost)
+else()
+  # Using boost-regex
+  if(LYX_EXTERNAL_BOOST)
+    message(STATUS "Searching for external boost")
+    find_package(Boost COMPONENTS regex)
+    if(Boost_FOUND)
+      message(STATUS "Boost found")
+      message(STATUS "Boost-libs = ${Boost_LIBRARIES}")
+      set(Lyx_Boost_Libraries ${Boost_LIBRARIES})
+      if (LYX_STDLIB_DEBUG OR LYX_DEBUG_GLIBC OR LYX_DEBUG_GLIBC_PEDANTIC)
+       # Comment from  Jean-Marc Lasgouttes:
+       # In general, system boost libraries are incompatible with
+       # the use of stdlib-debug in libstdc++. See ticket #9736 for
+       # details.
+       message(FATAL_ERROR "Compiling LyX with stdlib-debug and system boost libraries may lead to crashes. Consider using '-DLYX_STDLIB_DEBUG=OFF -DLYX_DEBUG_GLIBC=OFF -DLYX_DEBUG_GLIBC_PEDANTIC=OFF' or using '-DLYX_EXTERNAL_BOOST=OFF'")
+      endif()
+    else()
+      message(FATAL_ERROR "Boost not found" ${Boost_ERROR_REASON})
+    endif()
+  else()
+    # Using included boost
+    set(Lyx_Boost_Libraries boost_regex)
+    add_definitions(-DBOOST_USER_CONFIG=<config.h>)
+    include_directories(${TOP_SRC_DIR}/3rdparty/boost)
+    add_subdirectory(3rdparty/boost "${TOP_BINARY_DIR}/3rdparty/boost")
+  endif()
+endif()
 
 if(WIN32)
        if(LYX_CONSOLE)
@@ -819,7 +998,7 @@ if(WIN32)
        else()
                # -DPSAPI_VERSION=1 is not needed for mingw, since the mingw psapi.h
                # does not use it and always declares the vista compatible API.
-               # If this ever changes then -DPSAPI_VERSION might be needed here as well. 
+               # If this ever changes then -DPSAPI_VERSION might be needed here as well.
                add_definitions(-DWINVER=0x0500)
        endif()
 endif()
@@ -828,7 +1007,7 @@ endif()
 
 message(STATUS "")
 foreach(_v PACKAGE PACKAGE_VERSION
-       PROGRAM_SUFFIX LYX_DATE LYX_DIR_VER LYX_USERDIR_VER
+       PROGRAM_SUFFIX LYX_VERSION LYX_DIR_VER LYX_USERDIR_VER
        LYX_ABS_TOP_SRCDIR
        LYX_ABS_INSTALLED_DATADIR LYX_ABS_INSTALLED_LOCALEDIR LYX_INSTALL_SUFFIX)
        if(NOT DEFINED ${_v})
@@ -889,7 +1068,7 @@ if(MSVC)
 
        if(LYX_WALL)
                # Use the highest warning level
-               set(CMAKE_CXX_WARNING_LEVEL 4 CACHE TYPE STRING FORCE)
+               set(CMAKE_CXX_WARNING_LEVEL 4 CACHE STRING "Warning level" FORCE)
 
                if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
                        string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
@@ -908,12 +1087,12 @@ if(MSVC)
                # add here warnings which should be disabled /wdXXXX
                set(MSVC_W_DISABLE "/wd4288 /wd4355 /wd4800 /wd4996 /wd4311 /wd4312 /wd4505 /wd4267 /wd4512 /wd4245 /wd4127 /wd4180 /wd4231")
 
-               set(CMAKE_CXX_FLAGS_DEBUG      "${CMAKE_CXX_FLAGS_DEBUG} /Wp64 ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
-               set(CMAKE_CXX_FLAGS_RELEASE    "${CMAKE_CXX_FLAGS_RELEASE} /Wp64 ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
-               set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /Wp64 ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
+               set(CMAKE_CXX_FLAGS_DEBUG      "${CMAKE_CXX_FLAGS_DEBUG} /W4 ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
+               set(CMAKE_CXX_FLAGS_RELEASE    "${CMAKE_CXX_FLAGS_RELEASE} /W4 ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
+               set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /W4 ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
 
        else()
-               set(CMAKE_CXX_WARNING_LEVEL 3 CACHE TYPE STRING FORCE)
+               set(CMAKE_CXX_WARNING_LEVEL 3 CACHE STRING "Warning level" FORCE)
 
                # add here warnings which should produce an error /weXXXX
                set(MSVC_W_ERROR   "/we4101 /we4189")
@@ -939,14 +1118,6 @@ if(MSVC)
 endif()
 
 
-if(LYX_DEBUG_GLIBC)
-       set(_GLIBCXX_DEBUG ON)
-endif()
-
-if(LYX_DEBUG_GLIBC_PEDANTIC)
-       set(_GLIBCXX_DEBUG_PEDANTIC ON)
-endif()
-
 # Xcode compiler
 if (CMAKE_GENERATOR MATCHES Xcode)
        if (XCODE_VERSION VERSION_LESS "5.0")
@@ -970,7 +1141,43 @@ endif()
 include(${LYX_CMAKE_DIR}/ConfigureChecks.cmake)
 configure_file(${LYX_CMAKE_DIR}/configCompiler.h.cmake ${TOP_BINARY_DIR}/configCompiler.h)
 
+unset(opts)
+foreach(_option ${LYX_OPTIONS})
+  if(${_option}_show_message)
+    string(SUBSTRING "${_option}                            " 0 31 _var)
+    get_property(_prop CACHE ${_option} PROPERTY STRINGS)
+    list(FIND LYX_OPTION_STRINGS ${_option} _index)
+    if (${_index} GREATER -1)
+      set(_isset ${${_option}})
+    elseif(${_option})
+      set(_isset ON)
+    else()
+      set(_isset OFF)
+    endif()
+    string(SUBSTRING "${_isset}           " 0 10 _val)
+    set(opts "${opts} ${_option}(${${_option}})")
+  endif()
+endforeach()
+set(tmp_vi "CMake Build")
+list(APPEND tmp_vi "  Host name:               ${CMAKE_HOST_SYSTEM_NAME}")
+list(APPEND tmp_vi "  Host processor:          ${CMAKE_HOST_SYSTEM_PROCESSOR}")
+list(APPEND tmp_vi "  Build flags:             ${opts}")
+list(APPEND tmp_vi "  C++ Compiler:            ${CMAKE_CXX_COMPILER_ID} (${CMAKE_CXX_COMPILER_VERSION})")
+list(APPEND tmp_vi "  C++ Compiler flags:      ${CMAKE_CXX_FLAGS}")
+if (LYX_DEBUG)
+list(APPEND tmp_vi "  C++ Compiler user flags: ${CMAKE_CXX_FLAGS_DEBUG}")
+else()
+list(APPEND tmp_vi "  C++ Compiler user flags: ${CMAKE_CXX_FLAGS_RELEASE}")
+endif()
+list(APPEND tmp_vi "  Qt version:              ${QTVERSION}")
+list(APPEND tmp_vi "  LyX binary dir:          ${CMAKE_INSTALL_PREFIX}/${LYX_UTILITIES_INSTALL_PATH}")
+get_data_destination(dest_data)
+list(APPEND tmp_vi "  LyX files dir:           ${CMAKE_INSTALL_PREFIX}/${dest_data}")
+string(REPLACE ";" "\\n" VERSION_INFO "${tmp_vi}")
+
 configure_file(${LYX_CMAKE_DIR}/config.h.cmake ${TOP_BINARY_DIR}/config.h)
+unset(opts)
+unset(tmp_vi)
 
 if(QTVERSION MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+).*")
        MATH(EXPR QT4_VERSION "(${CMAKE_MATCH_1}<<16)|(${CMAKE_MATCH_2}<<8)|${CMAKE_MATCH_3}")
@@ -990,16 +1197,6 @@ endif ()
 add_custom_target (lyx_run_tests COMMAND ${cmd})
 set_target_properties(lyx_run_tests PROPERTIES FOLDER "tests")
 
-if(LYX_ASAN)
-    set(LYX_CXX_FLAGS "-fsanitize=address -fno-omit-frame-pointer -g")
-    message(STATUS)
-    message(STATUS "Address sanitizer enabled. Usage:")
-    message(STATUS "    wget https://llvm.org/svn/llvm-project/compiler-rt/trunk/lib/asan/scripts/asan_symbolize.py")
-    message(STATUS "    chmod  +x ./asan_symbolize.py")
-    message(STATUS "    ./bin/lyx2.2 2>&1 | ./asan_symbolize.py  | c++filt ")
-    message(STATUS)
-endif()
-
 if(LYX_INSTALL)
        if(${LYX_PYTHON_EXECUTABLE} MATCHES "-NOTFOUND")
                message(STATUS "Python required to create doc!")
@@ -1009,18 +1206,25 @@ if(LYX_INSTALL)
                endif()
                add_subdirectory(${LYX_CMAKE_DIR}/doc "${TOP_BINARY_DIR}/doc")
        endif()
-       include(../Install)
 endif()
+include(../Install)
+
+# By running the URL tests first, time can be saved when running the ctests in
+# parallel since the URL tests take a long time to run (e.g. 10 minutes).
+
+# Needed, because of perl scripts in checkurls autotests and batchtests
+find_package(Perl REQUIRED)
 
+if(LYX_ENABLE_URLTESTS)
+       add_subdirectory(development/checkurls "${TOP_BINARY_DIR}/checkurls")
+endif()
 add_subdirectory(src "${TOP_BINARY_DIR}/src")
 add_subdirectory(lib/lyx2lyx "${TOP_BINARY_DIR}/lyx2lyx")
 add_subdirectory(lib/scripts "${TOP_BINARY_DIR}/scripts")
 add_subdirectory(lib/examples "${TOP_BINARY_DIR}/lib/examples")
 add_subdirectory(sourcedoc "${TOP_BINARY_DIR}/sourcedoc")
 add_subdirectory(development/autotests "${TOP_BINARY_DIR}/autotests")
-if(LYX_ENABLE_URLTESTS)
-       add_subdirectory(development/checkurls "${TOP_BINARY_DIR}/checkurls")
-endif()
+add_subdirectory(development/batchtests "${TOP_BINARY_DIR}/batchtests")
 
 message(STATUS)
 message(STATUS "Build params, switch LYX_* options by -DLYX_*=ON or OFF, LYX_* combos by -DLYX_*=value:")