X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=023c3e14b71e9d51a766724c9f924e6fffc395b7;hb=6de3c19fd63f810eed90ef3bc4469faf28e949c2;hp=abf9ce0e206bbb3196510265332b8f9ef9db6b7c;hpb=14d388e0dbf06f5fc8b33fbff05281726ceed3ea;p=lyx.git diff --git a/CMakeLists.txt b/CMakeLists.txt index abf9ce0e20..023c3e14b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ set(CMAKE_MODULE_PATH "${TOP_MODULE_PATH}") set(CMAKE_PROJECT_NAME ${LYX_PROJECT}) message(STATUS) -if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) +if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) message(STATUS "Building in-source") set(TOP_BINARY_DIR "${CMAKE_BINARY_DIR}/build") else() @@ -31,6 +31,9 @@ else() set(TOP_BINARY_DIR "${CMAKE_BINARY_DIR}") endif() +# This directory should be used if some test uses lyx-executable +set(LYX_TESTS_USERDIR "${TOP_BINARY_DIR}/Testing/.lyx") +file(MAKE_DIRECTORY "${LYX_TESTS_USERDIR}") if(COMMAND cmake_policy) cmake_policy(SET CMP0003 OLD) @@ -92,8 +95,8 @@ LYX_OPTION(MERGE_FILES "Merge source files into one compilation unit" OFF A LYX_OPTION(MERGE_REBUILD "Rebuild generated files from merged files build" OFF ALL) LYX_OPTION(QUIET "Don't generate verbose makefiles" OFF ALL) LYX_OPTION(INSTALL_PREFIX "Install path for LyX" OFF ALL) -LYX_OPTION(EXTERNAL_LIBINTL "Use external libintl" ON ALL) LYX_OPTION(BUNDLE "Build bundle (experimental) " OFF ALL) +LYX_OPTION(ENABLE_URLTESTS "Enable for URL tests" OFF ALL) # GCC specific LYX_OPTION(PROFILE "Build profile version" OFF GCC) @@ -210,11 +213,11 @@ if(UNIX OR MINGW) set(LYX_USE_TR1_REGEX 0) endif() if (LYX_ENABLE_CXX11) - if(GCC_VERSION VERSION_GREATER 4.7) - set(LYX_GCC11_MODE "-std=gnu++11") - elseif(GCC_VERSION VERSION_GREATER 4.2) - set(LYX_GCC11_MODE "-std=gnu++0x") + 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() else() if(MSVC10) @@ -276,7 +279,8 @@ if (LYX_LOCALVERSIONING) FIND_PROGRAM(LYX_GITVERSION git) #message(STATUS "gitversion = ${LYX_GITVERSION}") if(LYX_GITVERSION) - EXECUTE_PROCESS(COMMAND ${LYX_GITVERSION} "describe" WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE LYX_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE) + 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]+\)\\-.*$") # We will add offset of 40000 to get appropriate value to # previous svn. @@ -385,6 +389,9 @@ set(LYX_LOCALEDIR "locale") set(LYX_ABS_INSTALLED_LOCALEDIR "${LYX_ABS_INSTALLED_DATADIR}/${LYX_DATA_SUBDIR}${LYX_LOCALEDIR}") set(LYX_ABS_TOP_SRCDIR "${TOP_SRC_DIR}") +set(LYX_MAN_DIR "/usr/local/man" CACHE STRING + "Install location for man pages.") +mark_as_advanced(LYX_MAN_DIR) if(LYX_INSTALL AND WIN32) message(STATUS "Configuring NSIS files") @@ -439,7 +446,7 @@ endif() if(LYX_SHARED_LIBRARIES) set(library_type SHARED) else() - set(library_type STATIC) + set(library_type STATIC) endif() if(NOT MSVC) @@ -462,8 +469,39 @@ if(NOT MSVC) endif() endif() +set(LYX_CXX_FLAGS_EXTRA "" CACHE STRING "Desired semicolon separated list of extra cxx compile flags, like '-Werror'") +mark_as_advanced(LYX_CXX_FLAGS_EXTRA) +if(LYX_CXX_FLAGS_EXTRA) + foreach(_flag ${LYX_CXX_FLAGS_EXTRA}) + add_definitions(${_flag}) + endforeach() +endif() + +find_package(Qt5Core QUIET) +if (Qt5Core_FOUND) + find_package(Qt5Widgets REQUIRED) + set(QTVERSION ${Qt5Core_VERSION}) + macro (qt_use_modules) + qt5_use_modules(${ARGN}) + endmacro() + macro (qt_add_resources) + qt5_add_resources(${ARGN}) + endmacro() + macro (qt_wrap_uifiles) + qt5_wrap_ui(${ARGN}) + endmacro() +else() + find_package(Qt4 "4.5.0" REQUIRED) + macro (qt_use_modules) + endmacro() + macro (qt_add_resources) + qt4_add_resources(${ARGN}) + endmacro() + macro (qt_wrap_uifiles) + qt4_wrap_ui(${ARGN}) + endmacro() +endif() -find_package(Qt4 REQUIRED) find_package(Magic) if(Magic_FOUND) set(HAVE_MAGIC_H 1) @@ -488,33 +526,20 @@ endif() if(LYX_NLS) FIND_PROGRAM(LYX_PYTHON_EXECUTABLE python2 python HINTS ${GNUWIN32_DIR}/python) - if(${LYX_PYTHON_EXECUTABLE} MATCHES "-NOTFOUND") - message(FATAL_ERROR "Python 2.6 needed!") - endif() - find_package(LyXGettext REQUIRED) - add_subdirectory(po "${TOP_BINARY_DIR}/po") -endif() - -if(LYX_NLS) - if(LYX_EXTERNAL_LIBINTL) - find_package(Libintl REQUIRED) - if(DEFINED LIBINTL_LIBRARIES) - # find getext when configuring - list(APPEND CMAKE_REQUIRED_LIBRARIES ${LIBINTL_LIBRARIES}) - # on mac use iconv also form ports - get_filename_component(ICONV_RELATIVE_TO_LIBINTL ${LIBINTL_LIBRARIES} PATH) - endif() + find_package(LyXGettext) + if(LYX_PYTHON_EXECUTABLE AND GETTEXT_FOUND) + add_subdirectory(po "${TOP_BINARY_DIR}/po") else() - add_subdirectory(intl "${TOP_BINARY_DIR}/intl") + # Install only supplied .gmo-files + file(GLOB _gmofiles RELATIVE "${TOP_SRC_DIR}/po" "${TOP_SRC_DIR}/po/*.gmo") + 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) + endforeach() endif() endif() -if(LYX_EXTERNAL_LIBINTL) - set(intl_link ${LIBINTL_LIBRARIES}) -else() - set(intl_link intl) -endif() - find_package(ICONV REQUIRED) find_package(ZLIB REQUIRED) @@ -657,9 +682,12 @@ if(MSVC) set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} ${MSVC_W_ERROR} ${MSVC_W_DISABLE}") endif() - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Zc:wchar_t-") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zc:wchar_t-") - set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /Zc:wchar_t-") + + if (NOT Qt5Core_FOUND) + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Zc:wchar_t-") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zc:wchar_t-") + set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /Zc:wchar_t-") + endif() message(STATUS "----- Warning level : ${CMAKE_CXX_WARNING_LEVEL} ${WARNING_LEVEL_MESSAGE}") message(STATUS "----- Warnings as errors : ${MSVC_W_ERROR}") @@ -678,18 +706,22 @@ endif() # Xcode compiler if (CMAKE_GENERATOR MATCHES Xcode) - # Automatically select the Xcode compiler if not set - if (NOT DEFINED CMAKE_XCODE_ATTRIBUTE_GCC_VERSION) - # XCode >= 3.1 has gcc 4.2 (up to actual Xcode) - if (XCODE_VERSION VERSION_GREATER "3.1") - SET(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42") - ENDIF(XCODE_VERSION VERSION_GREATER "3.1") - ENDIF(NOT DEFINED CMAKE_XCODE_ATTRIBUTE_GCC_VERSION) - - # Print the selected compiler version - MESSAGE(STATUS "---- Using XCode compiler CMAKE_XCODE_ATTRIBUTE_GCC_VERSION=${CMAKE_XCODE_ATTRIBUTE_GCC_VERSION}") + if (XCODE_VERSION VERSION_LESS "5.0") + # Automatically select the Xcode compiler if not set + if (NOT DEFINED CMAKE_XCODE_ATTRIBUTE_GCC_VERSION) + # XCode >= 3.1 has gcc 4.2 (up to actual Xcode) + if (XCODE_VERSION VERSION_GREATER "3.1") + SET(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42") + ENDIF(XCODE_VERSION VERSION_GREATER "3.1") + ENDIF(NOT DEFINED CMAKE_XCODE_ATTRIBUTE_GCC_VERSION) + # Print the selected compiler version + MESSAGE(STATUS "---- Using XCode compiler CMAKE_XCODE_ATTRIBUTE_GCC_VERSION=${CMAKE_XCODE_ATTRIBUTE_GCC_VERSION}") + ENDIF(XCODE_VERSION VERSION_LESS "5.0") ENDIF(CMAKE_GENERATOR MATCHES Xcode) +if (WIN32 AND Qt5Core_FOUND) + set(Z_PREFIX 1) +endif() # compiler tests, config.h generation if(MSVC AND NOT LYX_CONFIGURE_CHECKS) @@ -738,6 +770,9 @@ endif() add_subdirectory(sourcedoc "${TOP_BINARY_DIR}/sourcedoc") add_subdirectory(development/autotests "${TOP_BINARY_DIR}/autotests") +if(LYX_ENABLE_URLTESTS) + add_subdirectory(development/checkurls "${TOP_BINARY_DIR}/checkurls") +endif() message(STATUS) message(STATUS "Build options, switch LYX_* variables by -DLYX_*=ON or OFF:") @@ -749,9 +784,6 @@ if(LYX_NLS) message(STATUS) message(STATUS "Building Native Language Support (LYX_NLS is set), used libraries:") message(STATUS) - message(STATUS " * intl") - message(STATUS " - header : ${LIBINTL_HEADER}") - message(STATUS " - library: ${LIBINTL_LIBRARIES}") message(STATUS " * iconv") message(STATUS " - header : ${ICONV_HEADER}") message(STATUS " - library: ${ICONV_LIBRARY}")