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()
get_filename_component(lyx_dir_readme ${CMAKE_SOURCE_DIR}/README REALPATH) # Resolve symlinks
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)
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(NO_OPTIMIZE "Don't use any optimization/debug flags" OFF ALL)
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)
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)
+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_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_COMBO(EXTERNAL_MYTHES "OFF := Build 3rdparty lib mytheslib" AUTO OFF ON)
# GCC specific
LYX_OPTION(PROFILE "Build profile version" OFF GCC)
LYX_OPTION(PROFILE "Build with options for gprof" OFF 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(CONFIGURE_CHECKS "Also run configure checks for MSVC" OFF MSVC)
LYX_OPTION(DEPENDENCIES_DOWNLOAD "Download dependencies for MSVC 10" OFF MSVC)
# APPLE specific
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)
set(LYX_MERGE_REBUILD OFF)
endif()
-
if(LYX_DEPENDENCIES_DOWNLOAD)
message(STATUS)
- if(MSVC12)
- set(LYX_DEPENDENCIES_DIR ${TOP_BINARY_DIR}/msvc2013-deps)
- set(deps_files lyx-windows-deps-msvc2013.zip)
- set(deps_server http://ftp.lyx.de/LyX-Windows-Deps)
- set(GNUWIN32_DIR ${LYX_DEPENDENCIES_DIR}/lyx-windows-deps-msvc2013)
- else()
- set(LYX_DEPENDENCIES_DIR ${TOP_BINARY_DIR}/msvc2010-deps)
- set(deps_files lyx20-deps-msvc2010-x86.zip)
- set(deps_server http://downloads.sourceforge.net/project/lyx/Win_installers/Dependencies)
- set(GNUWIN32_DIR ${LYX_DEPENDENCIES_DIR}/deps20)
- endif()
+ if(MSVC14)
+ set(LYX_DEPENDENCIES_DIR ${TOP_BINARY_DIR}/msvc2015-deps)
+ set(deps_files lyx-windows-deps-msvc2015.zip)
+ set(deps_server http://ftp.lyx.de/LyX-Windows-Deps)
+ set(GNUWIN32_DIR ${LYX_DEPENDENCIES_DIR}/lyx-windows-deps-msvc2015)
+ elseif(MSVC10)
+ set(LYX_DEPENDENCIES_DIR ${TOP_BINARY_DIR}/msvc2010-deps)
+ set(deps_files lyx-windows-deps-msvc2010.zip)
+ set(deps_server http://ftp.lyx.de/LyX-Windows-Deps)
+ set(GNUWIN32_DIR ${LYX_DEPENDENCIES_DIR}/lyx-windows-deps-msvc2010)
+ else()
+ message(FATAL_ERROR "error: no dependency package known for the selected MSVC version.")
+ endif()
message(STATUS "Using downloaded dependencies in ${LYX_DEPENDENCIES_DIR}")
foreach(it ${deps_files})
set(already_downloaded already_downloaded-NOTFOUND CACHE PATH "downloaded" FORCE)
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)
- execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
- message(STATUS "Using GCC version ${GCC_VERSION}")
- if(GCC_VERSION VERSION_LESS 4.9)
- if(GCC_VERSION VERSION_LESS 4.3)
- message(FATAL_ERROR "gcc >= 4.3 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 (CMAKE_CXX_COMPILER_ID MATCHES "^[cC]lang$")
+ # ignore the GCC_VERSION for clang
+ # and use the resulting CXX11_STD_REGEX found in FindCXX11Compiler.cmake
+ message(STATUS "Using clang")
+ if(CXX11_STD_REGEX)
+ set(LYX_USE_STD_REGEX 1)
+ else()
+ set(LYX_USE_STD_REGEX 0)
+ endif()
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}")
+ execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+ 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)
+ else()
+ set(LYX_USE_STD_REGEX 1)
+ endif()
endif()
+ set(LYX_GCC11_MODE "${CXX11_FLAG}")
else()
set(LYX_USE_STD_REGEX 0)
# if(MSVC10)
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
+ set(LYX_EXTERNAL_Z OFF CACHE BOOL "Build 3rdparty lib zlib" FORCE)
+ set(LYX_EXTERNAL_ICONV OFF CACHE BOOL "Build 3rdparty iconvlib" FORCE)
+ set(LYX_EXTERNAL_HUNSPELL OFF CACHE BOOL "Build 3rdparty hunspelllib" FORCE)
+ set(LYX_EXTERNAL_MYTHES OFF CACHE STRING "Build 3rdparty mytheslib" FORCE)
+endif()
+
macro(setstripped _varname)
if(${ARGC} GREATER 1)
string(STRIP "${ARGV1}" _v)
FIND_PROGRAM(LYX_GITVERSION git)
#message(STATUS "gitversion = ${LYX_GITVERSION}")
set(LYX_REVISION_VERSION ${LYX_PATCH_VERSION})
+set(LYX_PACKAGE_RELEASE "1")
if(LYX_GITVERSION)
if (LYX_LOCALVERSIONING)
# Find the revision number and 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]+\)\\-.*$")
+ WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE tmp_LYX_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE)
+ 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
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
endif()
set(LYX_INSTALL_PREFIX ${LYX_INSTALL_PREFIX} CACHE PATH "LyX user's choice install prefix" FORCE)
-string(REGEX REPLACE "/lyx${LYX_INSTALL_SUFFIX}$" "/share" SYSTEM_DATADIR ${CMAKE_INSTALL_PREFIX})
+if(UNIX)
+ set(SYSTEM_DATADIR "${CMAKE_INSTALL_PREFIX}/share")
+elseif(CMAKE_INSTALL_PREFIX MATCHES "/lyx${LYX_INSTALL_SUFFIX}$")
+ string(REGEX REPLACE "/lyx${LYX_INSTALL_SUFFIX}$" "/share" SYSTEM_DATADIR ${CMAKE_INSTALL_PREFIX})
+else()
+ set(SYSTEM_DATADIR "${CMAKE_INSTALL_PREFIX}")
+endif()
-if(LYX_PACKAGE_SUFFIX)
+if(CMAKE_COMPILER_IS_GNUCXX)
+ message(STATUS "CMAKE_COMPILER_IS_GNUCXX = ${CMAKE_COMPILER_IS_GNUCXX}")
+ set(suffixing ${LYX_PROGRAM_SUFFIX})
+else()
+ # Not a GCC compiler, programs do not have a suffix
+ set(suffixing ${LYX_PACKAGE_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(suffixing)
set(PACKAGE ${PACKAGE_BASE}${LYX_INSTALL_SUFFIX})
else()
set(PACKAGE ${PACKAGE_BASE})
endif()
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")
if(NOT LYX_QUIET)
set(CMAKE_VERBOSE_MAKEFILE ON)
endif()
- set(LYX_CXX_FLAGS "-Wall -Wunused-parameter ${LYX_GCC11_MODE}")
+ set(LYX_CXX_FLAGS "-Wall -Wunused-parameter ${LYX_GCC11_MODE}")
+ if(LYX_CXX_FLAGS 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
+ # 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}")
+ endif()
if(LYX_STDLIB_DEBUG)
set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC")
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_DEBUG "-O0 -g3 -D_DEBUG" CACHE TYPE STRING 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 TYPE STRING FORCE)
else()
- set(CMAKE_CXX_FLAGS_RELEASE "${LYX_CXX_FLAGS} -O3 -DNDEBUG" CACHE TYPE STRING FORCE)
+ set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE TYPE STRING FORCE)
endif()
endif()
list(APPEND CMAKE_FIND_ROOT_PATH ${GNUWIN32_DIR})
endif()
-set(QPA_XCB)
+set(min_qt5_version "5.6")
+if(LYX_USE_QT MATCHES "AUTO")
+ # try qt5 first
+ find_package(Qt5Core 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(Qt5MacExtras REQUIRED)
endif()
find_package(Qt5X11Extras QUIET)
- if(Qt5X11Extras_FOUND)
- set(QPA_XCB 1)
- endif()
find_package(Qt5WinExtras QUIET)
set(QTVERSION ${Qt5Core_VERSION})
+ 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 >= \"${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})
endmacro()
macro (qt_wrap_uifiles)
qt4_wrap_ui(${ARGN})
endmacro()
+ set(LYX_QTMAIN_LIBRARY ${QT_QTSVG_LIBRARY})
if(WIN32)
- set(LYX_QTMAIN_LIBRARY ${QT_QTMAIN_LIBRARIES})
+ list(APPEND LYX_QTMAIN_LIBRARY ${QT_QTMAIN_LIBRARIES})
endif()
else()
message(FATAL_ERROR "Unhandled value for LYX_USE_QT (${LYX_USE_QT})")
set(Spelling_FOUND OFF)
set(Include_used_spellchecker) # String will be inserted into config.h
-if(LYX_3RDPARTY_BUILD)
+if (LYX_EXTERNAL_MYTHES MATCHES "AUTO")
+ # try system library first
+ find_package(MyThesLIB)
+ if (MYTHESLIB_FOUND)
+ set(LYX_EXTERNAL_MYTHES ON CACHE STRING "OFF:= Build 3rdparty mytheslib" FORCE)
+ else()
+ set(LYX_EXTERNAL_MYTHES OFF CACHE STRING "OFF:= Build 3rdparty mytheslib" FORCE)
+ endif()
+endif()
+if (LYX_EXTERNAL_MYTHES MATCHES "ON")
+ find_package(MyThesLIB REQUIRED)
+else()
+ add_subdirectory(3rdparty/mythes)
+endif()
+set(MYTHES_DIR ${MYTHESLIB_INCLUDE_DIR})
+
+if(NOT LYX_EXTERNAL_HUNSPELL)
add_subdirectory(3rdparty/hunspell)
add_definitions(-DHUNSPELL_STATIC)
set(HUNSPELL_FOUND ON)
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()
-
+# 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)
+find_package(PythonInterp 3.3 QUIET)
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)
+ 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")
endif()
endif()
-if(UNIX)
- find_package(ICONV REQUIRED)
- find_package(ZLIB REQUIRED)
+if(LYX_EXTERNAL_ICONV)
+ find_package(ICONV REQUIRED)
else()
- if(LYX_3RDPARTY_BUILD)
- add_subdirectory(3rdparty/libiconv)
- set(HAVE_ICONV_CONST 1)
- add_subdirectory(3rdparty/zlib)
- endif()
+ add_subdirectory(3rdparty/libiconv)
+ set(HAVE_ICONV_CONST 1)
endif()
-if(LYX_EXTERNAL_BOOST)
- message(STATUS "Searching for boost")
- if(LYX_USE_STD_REGEX)
- find_package(Boost COMPONENTS signals)
- else()
- find_package(Boost COMPONENTS signals 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()
+if(LYX_EXTERNAL_Z)
+ find_package(ZLIB REQUIRED)
else()
- if(LYX_USE_STD_REGEX)
- set(Lyx_Boost_Libraries boost_signals)
- else()
- set(Lyx_Boost_Libraries boost_signals boost_regex)
- endif()
- add_definitions(-DBOOST_USER_CONFIG="<config.h>")
- add_definitions(-DBOOST_SIGNALS_NO_DEPRECATION_WARNING=1)
- include_directories(${TOP_SRC_DIR}/3rdparty/boost)
- add_subdirectory(3rdparty/boost "${TOP_BINARY_DIR}/3rdparty/boost")
+ add_subdirectory(3rdparty/zlib)
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)
+ # 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()
+ # 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)
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()
-# Compute qt4-version from ${QTVERSION}
+# Compute qt-version from ${QTVERSION}
message(STATUS "")
foreach(_v PACKAGE PACKAGE_VERSION
set(Z_PREFIX 1)
endif()
-# compiler tests, config.h generation
-if(MSVC AND NOT LYX_CONFIGURE_CHECKS)
- configure_file(${LYX_CMAKE_DIR}/configCompiler.h.msvc ${TOP_BINARY_DIR}/configCompiler.h)
-else()
- include(${LYX_CMAKE_DIR}/ConfigureChecks.cmake)
- configure_file(${LYX_CMAKE_DIR}/configCompiler.h.cmake ${TOP_BINARY_DIR}/configCompiler.h)
-endif()
+# compiler tests, config.h generation LYX_CONFIGURE_CHECKS
+include(${LYX_CMAKE_DIR}/ConfigureChecks.cmake)
+configure_file(${LYX_CMAKE_DIR}/configCompiler.h.cmake ${TOP_BINARY_DIR}/configCompiler.h)
configure_file(${LYX_CMAKE_DIR}/config.h.cmake ${TOP_BINARY_DIR}/config.h)
endif()
add_subdirectory(${LYX_CMAKE_DIR}/doc "${TOP_BINARY_DIR}/doc")
endif()
- include(../Install)
endif()
+include(../Install)
add_subdirectory(src "${TOP_BINARY_DIR}/src")
add_subdirectory(lib/lyx2lyx "${TOP_BINARY_DIR}/lyx2lyx")