prepare Qt 5.6 builds

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9a8027894b423054867b44835c7db6996b47f41..43a0345c0e69a8b60a2ca6175703faa2b489308f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -140,6 +140,7 @@ 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)
@@ -149,7 +150,6 @@ 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(ENABLE_CXX11         "Build with options for c++11-mode" OFF GCC)
 
 # MSVC specific
 LYX_OPTION(CONSOLE               "Show console on Windows, enforce with =FORCE" ON MSVC)
@@ -252,6 +252,29 @@ 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)
+      if(NOT GCC_VERSION VERSION_LESS 4.3)
+        set(LYX_ENABLE_CXX11 ON CACHE TYPE STRING FORCE)
+      else()
+        set(LYX_ENABLE_CXX11 OFF CACHE TYPE STRING FORCE)
+      endif()
+    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()
+endif()
 set(LYX_GCC11_MODE)
 if(UNIX OR MINGW)
        execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -288,6 +311,10 @@ 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)
+       endif()
        set(USE_WINDOWS_PACKAGING ON)
 elseif(APPLE)
        set(USE_MACOSX_PACKAGING ON)
@@ -440,9 +467,9 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
                        set(CMAKE_INSTALL_PREFIX "/usr/local/${LYX_PROJECT}" CACHE PATH "LyX default install prefix" FORCE)
                endif()
        endif()
-       if(WIN32)
-               set(CMAKE_INSTALL_PREFIX LYX_INSTALLED CACHE PATH "LyX default install prefix" FORCE)
-       endif()
+endif()
+if(WIN32)
+       set(CMAKE_INSTALL_PREFIX LYX_INSTALLED CACHE PATH "LyX default install prefix" FORCE)
 endif()
 if(IS_ABSOLUTE)
        set(CMAKE_INSTALL_PREFIX_ABSOLUTE ${CMAKE_INSTALL_PREFIX})
@@ -468,7 +495,11 @@ 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.")
 else()
-       set(LYX_MAN_DIR "/usr/local/man/man1" CACHE STRING "Install location for man pages.")
+       if(WIN32)
+               set(LYX_MAN_DIR "${CMAKE_BINARY_DIR}/usr/local/man/man1" CACHE STRING "Install location for man pages.")
+       else()
+               set(LYX_MAN_DIR "/usr/local/man/man1" CACHE STRING "Install location for man pages.")
+       endif()
 endif()
 mark_as_advanced(LYX_MAN_DIR)
 
@@ -640,15 +671,18 @@ foreach(_spell "ASPELL" "Enchant" "Hunspell")
   endif()
 endforeach()
 
+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()
+       if(PYTHON_VERSION_STRING VERSION_GREATER 2.8)
+       unset(PYTHONINTERP_FOUND)
+       endif()
 endif()
 
-if (NOT PYTHONINTERP_FOUND)
+if(NOT PYTHONINTERP_FOUND)
   unset(PYTHON_EXECUTABLE CACHE)
   unset(PYTHON_VERSION_MAJOR)
   unset(PYTHON_VERSION_MINOR)
@@ -713,8 +747,8 @@ else()
        endif()
        add_definitions(-DBOOST_USER_CONFIG="<config.h>")
        add_definitions(-DBOOST_SIGNALS_NO_DEPRECATION_WARNING=1)
-       include_directories(${TOP_SRC_DIR}/boost)
-       add_subdirectory(boost "${TOP_BINARY_DIR}/boost")
+       include_directories(${TOP_SRC_DIR}/3rdparty/boost)
+       add_subdirectory(3rdparty/boost "${TOP_BINARY_DIR}/3rdparty/boost")
 endif()