Initialize GuiDocument:biblioChanged_ in constructor

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 825656447650bb5054719711ff556850c665b2e8..4d410b75b0fadcbb8077be56beb60e4a991d0f7c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -100,6 +100,7 @@ else()
 endif()
 
 include(LyXMacros)
+include(LyXDestinations)
 
 # Usage LYX_OPTION
 # 1. parameter: option name without prefix 'LYX_'
@@ -141,7 +142,6 @@ LYX_OPTION(ENABLE_EXPORT_TESTS "Enable for export tests" OFF ALL)
 LYX_OPTION(ASAN             "Use address sanitizer" OFF ALL)
 LYX_COMBO(USE_QT            "Use Qt version as frontend" QT4 QT5)
 LYX_OPTION(3RDPARTY_BUILD   "Build 3rdparty libs" OFF ALL)
-LYX_COMBO(ENABLE_CXX11          "Build with options for c++11-mode" AUTO ON OFF)
 
 # GCC specific
 LYX_OPTION(PROFILE              "Build profile version" OFF GCC)
@@ -253,24 +253,10 @@ else()
 endif()
 
 
-if(LYX_ENABLE_CXX11 MATCHES "AUTO")
-  # Set to some meaningful default
-  find_package(CXX11Compiler)
-  if(NOT CXX11COMPILER_FOUND)
-    set(LYX_ENABLE_CXX11 OFF CACHE TYPE STRING FORCE)
-  else()
-    if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-      execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
-        set(LYX_ENABLE_CXX11 ON CACHE TYPE STRING FORCE)
-    else()
-      # Not a gnu compiler
-      if(CMAKE_CXX_COMPILER_ID MATCHES "^[cC]lang$")
-        set(LYX_ENABLE_CXX11 ON CACHE TYPE STRING FORCE)
-      else()
-        set(LYX_ENABLE_CXX11 OFF CACHE TYPE STRING FORCE)
-      endif()
-    endif()
-  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)
 if(UNIX OR MINGW)
@@ -284,17 +270,9 @@ if(UNIX OR MINGW)
                # see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631
                set(LYX_USE_STD_REGEX 0)
        else()
-               if (LYX_ENABLE_CXX11)
-                       set(LYX_USE_STD_REGEX 1)
-               endif()
-       endif()
-       if (LYX_ENABLE_CXX11)
-               find_package(CXX11Compiler)
-               if(NOT CXX11COMPILER_FOUND)
-                       message(FATAL_ERROR "A C++11 compatible compiler is required.")
-               endif()
-               set(LYX_GCC11_MODE "${CXX11_FLAG}")
+               set(LYX_USE_STD_REGEX 1)
        endif()
+       set(LYX_GCC11_MODE "${CXX11_FLAG}")
 else()
        set(LYX_USE_STD_REGEX 0)
 #      if(MSVC10)
@@ -463,13 +441,9 @@ endif()
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
        # see http://www.cmake.org/pipermail/cmake/2006-October/011559.html
        if (UNIX)
-               # don't use the default "/usr/local"
+               # use the default "/usr/local"
                # but respect the user-choice on the command-line
-               if(LYX_INSTALL_SUFFIX)
-                       set(CMAKE_INSTALL_PREFIX "/usr/local/lyx${LYX_INSTALL_SUFFIX}" CACHE PATH "LyX default install prefix" FORCE)
-               else()
-                       set(CMAKE_INSTALL_PREFIX "/usr/local/${LYX_PROJECT}" CACHE PATH "LyX default install prefix" FORCE)
-               endif()
+               set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "LyX default install prefix" FORCE)
        endif()
 endif()
 if(WIN32)
@@ -492,7 +466,7 @@ if(NOT LYX_DATA_SUBDIR)
 endif()
 
 set(LYX_ABS_INSTALLED_DATADIR "${CMAKE_INSTALL_PREFIX}")
-set(LYX_LOCALEDIR "${locale_dir}")
+get_locale_destination(LYX_LOCALEDIR)
 set(LYX_ABS_INSTALLED_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/${LYX_LOCALEDIR}")
 set(LYX_ABS_TOP_SRCDIR "${TOP_SRC_DIR}")
 
@@ -500,9 +474,11 @@ if(LYX_BUNDLE AND APPLE)
        set(LYX_MAN_DIR "${LYX_DATA_SUBDIR}" CACHE STRING "Install location for man pages.")
 else()
        if(WIN32)
-               set(LYX_MAN_DIR "${CMAKE_BINARY_DIR}/usr/local/man/man1" CACHE STRING "Install location for man pages.")
+               set(LYX_MAN_DIR "${CMAKE_BINARY_DIR}/usr/local/man" CACHE STRING "Install location for man pages.")
+       elseif(UNIX)
+               set(LYX_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE STRING "Install location for man pages.")
        else()
-               set(LYX_MAN_DIR "/usr/local/man/man1" CACHE STRING "Install location for man pages.")
+               set(LYX_MAN_DIR "${CMAKE_INSTALL_PREFIX}/man" CACHE STRING "Install location for man pages.")
        endif()
 endif()
 mark_as_advanced(LYX_MAN_DIR)
@@ -592,7 +568,6 @@ if(LYX_XMINGW)
        list(APPEND CMAKE_FIND_ROOT_PATH ${GNUWIN32_DIR})
 endif()
 
-set(QPA_XCB)
 if(LYX_USE_QT MATCHES "QT5")
        # set QPA_XCB if QT uses X11
        find_package(Qt5Core REQUIRED)
@@ -602,9 +577,6 @@ if(LYX_USE_QT MATCHES "QT5")
                        find_package(Qt5MacExtras REQUIRED)
                endif()
                find_package(Qt5X11Extras QUIET)
-               if(Qt5X11Extras_FOUND)
-                 set(QPA_XCB 1)
-               endif()
                find_package(Qt5WinExtras QUIET)
                set(QTVERSION ${Qt5Core_VERSION})
                macro (qt_use_modules)
@@ -928,6 +900,11 @@ else()
        configure_file(${LYX_CMAKE_DIR}/configCompiler.h.cmake ${TOP_BINARY_DIR}/configCompiler.h)
 endif()
 
+set(QPA_XCB)
+if(Qt5X11Extras_FOUND AND QT_USES_X11)
+  # QPA_XCB is only valid if QT5+X11
+  set(QPA_XCB 1)
+endif()
 configure_file(${LYX_CMAKE_DIR}/config.h.cmake ${TOP_BINARY_DIR}/config.h)
 
 if(QTVERSION MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+).*")