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)
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)
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)
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)
if (Qt5Core_FOUND)
find_package(Qt5Widgets REQUIRED)
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)
set(WIN32_CONSOLE WIN32)
endif()
if(MSVC)
- add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DNOMINMAX)
+ # -DPSAPI_VERSION=1 is needed to run on vista (bug 10186)
+ add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DNOMINMAX -DPSAPI_VERSION=1)
# disable checked iterators for msvc release builds to get maximum speed
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /D_SECURE_SCL=0")
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.
add_definitions(-DWINVER=0x0500)
endif()
endif()