X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=43a0345c0e69a8b60a2ca6175703faa2b489308f;hb=3e6c4efbc33d1ce056a60e7c396c4a4d04eeb0b6;hp=a5b85132b21481c2cc8d233cc418854ce9402d24;hpb=5bc44b2cf290e2c3907851f57e2faff3d319fe67;p=lyx.git diff --git a/CMakeLists.txt b/CMakeLists.txt index a5b85132b2..43a0345c0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -139,6 +139,8 @@ LYX_OPTION(ENABLE_URLTESTS "Enable for URL tests" OFF ALL) 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) @@ -148,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) @@ -251,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) @@ -287,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) @@ -439,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}) @@ -467,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) @@ -611,9 +643,20 @@ include_directories(${TOP_BINARY_DIR} ${TOP_SRC_DIR}/src) set(Spelling_FOUND OFF) set(Include_used_spellchecker) # String will be inserted into config.h +if(LYX_3RDPARTY_BUILD) + add_subdirectory(3rdparty/hunspell) + add_definitions(-DHUNSPELL_STATIC) + set(HUNSPELL_FOUND ON) + message(STATUS " * Hunspell:") + message(STATUS " - include: ${HUNSPELL_INCLUDE_DIR}") + message(STATUS " - library: ${HUNSPELL_LIBRARY}") +endif() + foreach(_spell "ASPELL" "Enchant" "Hunspell") string(TOUPPER ${_spell} _upspell) - find_package(${_spell}) + if (NOT ${_upspell}_FOUND) + find_package(${_spell}) + endif() if (${_upspell}_FOUND) include_directories(${${_upspell}_INCLUDE_DIR}) set(Spelling_FOUND ON) @@ -628,14 +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) @@ -660,9 +707,16 @@ if(LYX_NLS) endif() endif() - -find_package(ICONV REQUIRED) -find_package(ZLIB REQUIRED) +if(UNIX) + find_package(ICONV REQUIRED) + find_package(ZLIB REQUIRED) +else() + if(LYX_3RDPARTY_BUILD) + add_subdirectory(3rdparty/libiconv) + set(HAVE_ICONV_CONST 1) + add_subdirectory(3rdparty/zlib) + endif() +endif() if(LYX_EXTERNAL_BOOST) message(STATUS "Searching for boost") @@ -693,8 +747,8 @@ else() endif() add_definitions(-DBOOST_USER_CONFIG="") 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() @@ -929,10 +983,10 @@ if(LYX_NLS) message(STATUS "Building Native Language Support (LYX_NLS is set), used libraries:") message(STATUS) message(STATUS " * iconv") - message(STATUS " - header : ${ICONV_HEADER}") + message(STATUS " - include: ${ICONV_INCLUDE_DIR}") message(STATUS " - library: ${ICONV_LIBRARY}") message(STATUS " * zlib") - message(STATUS " - header : ${ZLIB_HEADER}") + message(STATUS " - include: ${ZLIB_INCLUDE_DIR}") message(STATUS " - library: ${ZLIB_LIBRARY}") message(STATUS) endif()