Cleanup: BufferView should not need to be friend of TextMetrics

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ccf7b307ac024333ba84691d04e62a8a0867c1f..2bf99209c5d9a94758506a9a805f7928174d611b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -103,8 +103,21 @@ 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)
@@ -123,6 +136,26 @@ list(GET _version_list 4 LYX_RELEASE_PATCH)
 # 3. parameter: default value, ON or OFF
 # 4. parameter: system on which option is used: ALL, GCC, MSVC, ...
 
+
+# Select some defaults depending on LYX_BUILD_TYPE
+if(LYX_BUILD_TYPE STREQUAL "development")
+  set(DefaultLyxDebug ON)
+  set(DefaultLyxRelease OFF)
+  set(DefaultLyxStdlibDebug ON)
+  set(DefaultLyxEnableAssertions ON)
+elseif(LYX_BUILD_TYPE STREQUAL "prerelease")
+  set(DefaultLyxDebug OFF)
+  set(DefaultLyxRelease OFF)
+  set(DefaultLyxStdlibDebug OFF)
+  set(DefaultLyxEnableAssertions OFF)
+elseif(LYX_BUILD_TYPE STREQUAL "release")
+  set(DefaultLyxDebug OFF)
+  set(DefaultLyxRelease ON)
+  set(DefaultLyxStdlibDebug OFF)
+  set(DefaultLyxEnableAssertions OFF)
+else()
+  message(FATAL_ERROR "Unknown build type (${LYX_BUILD_TYPE}) encountered")
+endif()
 # Usage LYX_COMBO
 # 1. parameter: name without prefix 'LYX_'
 # 2. parameter: description
@@ -140,9 +173,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(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)
@@ -179,7 +213,7 @@ 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(STDLIB_DEBUG         "Use debug stdlib" ${DefaultLyxStdlibDebug} GCC)
 
 # MSVC specific
 LYX_OPTION(CONSOLE               "Show console on Windows" ON MSVC)
@@ -356,20 +390,6 @@ else()
        endif()
 endif()
 
-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)
-       endif()
-       set(USE_WINDOWS_PACKAGING ON)
-elseif(APPLE)
-       set(USE_MACOSX_PACKAGING ON)
-else()
-       set(USE_POSIX_PACKAGING ON)
-endif()
-
 if(LYX_3RDPARTY_BUILD)
   # LYX_3RDPARTY_BUILD is not cached anymore, but for compatibility reasons
   # this enables the build of all 3rd_party libs
@@ -628,17 +648,24 @@ else()
        set(library_type STATIC)
 endif()
 
+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)")
+       set(LYX_CXX_FLAGS "-Wall -Wunused-parameter ${LYX_GCC11_MODE}${LYX_CXX_FLAGS}")
+       if(LYX_GCC11_MODE MATCHES "\\+\\+(14|11|98)")
          # 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