X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=cf0e708554281b00ac2930df98f2f8802dfd6ff5;hb=48fd76d4bfb99ee9dff20740c6b46683e36f043e;hp=c9a8027894b423054867b44835c7db6996b47f41;hpb=435db257e60587695d9328a8d5b4838435423363;p=lyx.git diff --git a/CMakeLists.txt b/CMakeLists.txt index c9a8027894..cf0e708554 100644 --- 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_' @@ -129,6 +130,7 @@ LYX_OPTION(RELEASE "Build release version, build debug when disabled" O LYX_OPTION(DEBUG "Enforce debug build" OFF ALL) LYX_OPTION(NO_OPTIMIZE "Don't use any optimization/debug flags" OFF ALL) LYX_OPTION(PACKAGE_SUFFIX "Use version suffix for packaging" ON ALL) +LYX_STRING(SUFFIX_VALUE "Use this string as suffix" "") LYX_OPTION(PCH "Use precompiled headers" OFF ALL) LYX_OPTION(MERGE_FILES "Merge source files into one compilation unit" OFF ALL) LYX_OPTION(MERGE_REBUILD "Rebuild generated files from merged files build" OFF ALL) @@ -149,13 +151,11 @@ 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) 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 @@ -210,17 +210,19 @@ 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) @@ -252,26 +254,37 @@ else() 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) - # 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}") - endif() + 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() + # 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) @@ -288,6 +301,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) @@ -319,7 +336,11 @@ foreach(_c_l ${_config_lines} ) set(LYX_PATCH_VERSION ${CMAKE_MATCH_4}) set(LYX_DIR_VER "LYX_DIR_${CMAKE_MATCH_1}${CMAKE_MATCH_2}x") set(LYX_USERDIR_VER "LYX_USERDIR_${CMAKE_MATCH_1}${CMAKE_MATCH_2}x") - set(LYX_INSTALL_SUFFIX "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}") + if ("${LYX_SUFFIX_VALUE}" MATCHES "") + set(LYX_INSTALL_SUFFIX "${LYX_MAJOR_VERSION}.${LYX_MINOR_VERSION}") + else() + set(LYX_INSTALL_SUFFIX "${LYX_SUFFIX_VALUE}") + endif() endif() endif() if(_c_l MATCHES "^AC_SUBST\\( *LYX_DATE *, *\\[\\\"(.*)\\\"\\].*") @@ -421,7 +442,13 @@ if(LYX_INSTALL_PREFIX) 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) set(PACKAGE ${PACKAGE_BASE}${LYX_INSTALL_SUFFIX}) @@ -432,18 +459,14 @@ 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() - endif() - if(WIN32) - set(CMAKE_INSTALL_PREFIX LYX_INSTALLED CACHE PATH "LyX default install prefix" FORCE) + set(CMAKE_INSTALL_PREFIX "/usr/local" 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}) else() @@ -456,19 +479,25 @@ if(NOT LYX_DATA_SUBDIR) if (WIN32) set(LYX_DATA_SUBDIR "Resources/" CACHE STRING "Subdirectory for all lyx-system-data" FORCE) else() - set(LYX_DATA_SUBDIR "" CACHE STRING "Subdirectory for all lyx-system-data" FORCE) + set(LYX_DATA_SUBDIR "share/${_lyx}/" CACHE STRING "Subdirectory for all lyx-system-data" FORCE) endif() endif() set(LYX_ABS_INSTALLED_DATADIR "${CMAKE_INSTALL_PREFIX}") -set(LYX_LOCALEDIR "locale") -set(LYX_ABS_INSTALLED_LOCALEDIR "${LYX_ABS_INSTALLED_DATADIR}/${LYX_DATA_SUBDIR}${LYX_LOCALEDIR}") +get_locale_destination(LYX_LOCALEDIR) +set(LYX_ABS_INSTALLED_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/${LYX_LOCALEDIR}") 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" 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 "${CMAKE_INSTALL_PREFIX}/man" CACHE STRING "Install location for man pages.") + endif() endif() mark_as_advanced(LYX_MAN_DIR) @@ -558,6 +587,7 @@ if(LYX_XMINGW) endif() if(LYX_USE_QT MATCHES "QT5") + # set QPA_XCB if QT uses X11 find_package(Qt5Core REQUIRED) if (Qt5Core_FOUND) find_package(Qt5Widgets REQUIRED) @@ -640,15 +670,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) @@ -668,7 +701,7 @@ if(LYX_NLS) message(STATUS "Installing provided .gmo-files only") foreach( _gmo ${_gmofiles}) string(REGEX REPLACE "\\.gmo$" "" _lang ${_gmo}) - install(FILES "${TOP_SRC_DIR}/po/${_gmo}" DESTINATION ${LYX_DATA_SUBDIR}${LYX_LOCALEDIR}/${_lang}/LC_MESSAGES RENAME ${PACKAGE}.mo) + install(FILES "${TOP_SRC_DIR}/po/${_gmo}" DESTINATION ${LYX_LOCALEDIR}/${_lang}/LC_MESSAGES RENAME ${PACKAGE}.mo) endforeach() endif() endif() @@ -686,10 +719,8 @@ 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) + if(NOT LYX_USE_STD_REGEX) + find_package(Boost COMPONENTS regex) endif() if(Boost_FOUND) message(STATUS "Boost found") @@ -706,15 +737,12 @@ if(LYX_EXTERNAL_BOOST) message(FATAL_ERROR "Boost not found" ${Boost_ERROR_REASON}) endif() else() - if(LYX_USE_STD_REGEX) - set(Lyx_Boost_Libraries boost_signals) - else() - set(Lyx_Boost_Libraries boost_signals boost_regex) + if(NOT LYX_USE_STD_REGEX) + set(Lyx_Boost_Libraries boost_regex) 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() @@ -877,14 +905,15 @@ if (WIN32 AND Qt5Core_FOUND) 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) +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]+).*")