X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=491e58f7f81c63b9dff0388d6a053fccf5d7fdb5;hb=6708c011d79f9cd6f3f979f5a693719966bfcc5b;hp=9ac172d06ae3db319a52af0fc4730183ae18b320;hpb=6dc198ed6e29131229fd9b47bba528fce206cf2e;p=lyx.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ac172d06a..491e58f7f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,6 +40,13 @@ if(COMMAND cmake_policy) cmake_policy(SET CMP0005 OLD) # Installing MACOSX_BUNDLE targets requires a BUNDLE DESTINATION cmake_policy(SET CMP0006 NEW) + 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) + endif() endif() set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) @@ -47,6 +54,19 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) # Supress regeneration set(CMAKE_SUPPRESS_REGENERATION FALSE) +if(LYX_XMINGW) + set(CMAKE_SYSTEM_NAME Windows) + set(TOOLNAME ${LYX_XMINGW}) + set(TOOLCHAIN "${TOOLNAME}-") + set(CMAKE_C_COMPILER "${TOOLCHAIN}gcc" CACHE PATH "Mingw C compiler" FORCE) + set(CMAKE_CXX_COMPILER "${TOOLCHAIN}g++" CACHE PATH "Mingw C++ compiler" FORCE) + set(CMAKE_RC_COMPILER "${TOOLCHAIN}windres" CACHE PATH "Mingw rc compiler" FORCE) + + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +endif() + if(NOT help AND NOT HELP) # 'project' triggers the searching for a compiler project(${LYX_PROJECT}) @@ -76,6 +96,11 @@ include(LyXMacros) # 3. parameter: default value, ON or OFF # 4. parameter: system on which option is used: ALL, GCC, MSVC, ... +# Usage LYX_COMBO +# 1. parameter: name without prefix 'LYX_' +# 2. parameter: description +# 3. parameter: default value +# 4-n parameter: possible other string values LYX_OPTION_INIT() @@ -100,6 +125,8 @@ LYX_OPTION(QUIET "Don't generate verbose makefiles" OFF ALL) LYX_OPTION(INSTALL_PREFIX "Install path for LyX" 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(ASAN "Use address sanitizer" OFF ALL) # GCC specific LYX_OPTION(PROFILE "Build profile version" OFF GCC) @@ -122,6 +149,11 @@ LYX_OPTION(DEPENDENCIES_DOWNLOAD "Download dependencies for MSVC 10" OFF MSVC) # APPLE specific LYX_OPTION(DMG "Build as Mac bundle, needed for .dmg (experimental) " OFF MAC) LYX_OPTION(COCOA "Use Cocoa on Mac" OFF MAC) +if(LYX_XMINGW) + LYX_COMBO(USE_QT "Use Qt version as frontend for MINGW" QT4) +else() + LYX_COMBO(USE_QT "Use Qt version as frontend" QT4 QT5) +endif() if(help OR HELP) @@ -146,7 +178,7 @@ endif() if(LYX_INSTALL) set(LYX_NLS ON) - if (WIN32) + if(WIN32 AND NOT MINGW) set(LYX_HUNSPELL ON) endif() if(LYX_CONSOLE MATCHES "FORCE") @@ -168,6 +200,7 @@ else() set(LYX_MERGE_REBUILD OFF) endif() + if(LYX_DEPENDENCIES_DOWNLOAD) message(STATUS) set(LYX_DEPENDENCIES_DIR ${TOP_BINARY_DIR}/msvc2010-deps) @@ -191,6 +224,10 @@ if(LYX_DEPENDENCIES_DOWNLOAD) endif() endforeach() set(GNUWIN32_DIR ${LYX_DEPENDENCIES_DIR}/deps20) + if(MSVC12) + # handle error in msvc12 when linking against msvc10 libs + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /vd2") + endif() endif() @@ -277,29 +314,33 @@ foreach(_c_l ${_config_lines} ) endif() endforeach(_c_l) -if (LYX_LOCALVERSIONING) - # Find the revision number and for later use - FIND_PROGRAM(LYX_GITVERSION git) - #message(STATUS "gitversion = ${LYX_GITVERSION}") - if(LYX_GITVERSION) - 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. - # We use this value than also to set the package-patch-value - MATH(EXPR tmp_REVISION_VERSION "(${CMAKE_MATCH_1}+40000)") - set(LYX_REVISION_VERSION "${LYX_PATCH_VERSION}-${tmp_REVISION_VERSION}git") - set(ENABLE_DIST ON) - endif() - else() - set(LYX_REVISION_VERSION git) #TODO use date - endif() -else() - set(LYX_REVISION_VERSION ${LYX_PATCH_VERSION}) +FIND_PROGRAM(LYX_GITVERSION git) +#message(STATUS "gitversion = ${LYX_GITVERSION}") +set(LYX_GIT_COMMIT_HASH "none") +set(LYX_REVISION_VERSION ${LYX_PATCH_VERSION}) +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]+\)\\-.*$") + # 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 + MATH(EXPR tmp_REVISION_VERSION "(${CMAKE_MATCH_1}+40000)") + set(LYX_REVISION_VERSION "${LYX_PATCH_VERSION}-${tmp_REVISION_VERSION}git") + set(ENABLE_DIST ON) + endif() + endif() + EXECUTE_PROCESS(COMMAND ${LYX_GITVERSION} log -1 "--pretty=format:%H" + WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE lyxgitcommit OUTPUT_STRIP_TRAILING_WHITESPACE) + if (lyxgitcommit MATCHES "^[0-9a-f]+$") + set(LYX_GIT_COMMIT_HASH ${lyxgitcommit}) + endif() endif() +#message(STATUS "LYX_GIT_COMMIT_HASH = ${LYX_GIT_COMMIT_HASH}") -# Set the programs (lyx, tex2lyx, etc.) suffix +# Set the programs (lyx, tex2lyx, etc.) suffix # When building an OS X bundle, we will append # the suffix only to the bundle, not to the programs set(PROGRAM_SUFFIX "") @@ -485,7 +526,7 @@ if(NOT MSVC) 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_STDLIB_DEBUG) set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC") endif() @@ -509,20 +550,31 @@ if(LYX_CXX_FLAGS_EXTRA) 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() +if(LYX_XMINGW) + set(QT_MINGW_DIR ${LYX_QT4} CACHE PATH "Qt for Mingw" FORCE) + list(APPEND CMAKE_FIND_ROOT_PATH ${QT_MINGW_DIR} ${GNUWIN32_DIR}) +endif() +if(LYX_USE_QT MATCHES "QT5") + find_package(Qt5Core REQUIRED) + if (Qt5Core_FOUND) + find_package(Qt5Widgets REQUIRED) + if(APPLE) + find_package(Qt5MacExtras REQUIRED) + endif() + find_package(Qt5X11Extras QUIET) + 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() + message(STATUS "Found Qt-Version ${QTVERSION}") + endif() +elseif(LYX_USE_QT MATCHES "QT4") find_package(Qt4 "4.5.0" REQUIRED) macro (qt_use_modules) endmacro() @@ -532,6 +584,8 @@ else() macro (qt_wrap_uifiles) qt4_wrap_ui(${ARGN}) endmacro() +else() + message(FATAL_ERROR "Unhandled value for LYX_USE_QT (${LYX_USE_QT})") endif() find_package(Magic) @@ -542,6 +596,8 @@ endif() include_directories(${TOP_BINARY_DIR} ${TOP_SRC_DIR}/src) set(Spelling_FOUND OFF) +set(Include_used_spellchecker) # String will be inserted into config.h + foreach(_spell "ASPELL" "Enchant" "Hunspell") string(TOUPPER ${_spell} _upspell) find_package(${_spell}) @@ -549,6 +605,7 @@ foreach(_spell "ASPELL" "Enchant" "Hunspell") include_directories(${${_upspell}_INCLUDE_DIR}) set(Spelling_FOUND ON) message(STATUS "Building with USE_${_upspell}") + set(Include_used_spellchecker "${Include_used_spellchecker}#define USE_${_upspell} 1\n") else() if(LYX_${_upspell}) message(FATAL_ERROR "Required ${_spell} devel package not found") @@ -574,6 +631,7 @@ if(LYX_NLS) endif() endif() + find_package(ICONV REQUIRED) find_package(ZLIB REQUIRED) @@ -619,7 +677,7 @@ endif() # Compute qt4-version from ${QTVERSION} message(STATUS "") -foreach(_v PACKAGE PACKAGE_VERSION +foreach(_v PACKAGE PACKAGE_VERSION LYX_GIT_COMMIT_HASH PROGRAM_SUFFIX LYX_DATE LYX_DIR_VER LYX_USERDIR_VER LYX_ABS_TOP_SRCDIR LYX_ABS_INSTALLED_DATADIR LYX_ABS_INSTALLED_LOCALEDIR LYX_INSTALL_SUFFIX) @@ -648,8 +706,8 @@ if(LYX_PCH) COMPILE_FLAGS "/Ycconfig.h /Fp\$(IntDir)/config.pch") set(${name_}_sources ${${name_}_sources} ${TOP_BINARY_DIR}/config_pch.cpp ${TOP_BINARY_DIR}/pcheaders.h) - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /DLYX_PCH_STL /DLYX_PCH_BOOST /DLYX_PCH_QT4") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /DLYX_PCH_STL /DLYX_PCH_BOOST /DLYX_PCH_QT4") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /DLYX_PCH_STL /DLYX_PCH_BOOST /DLYX_PCH_QT") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /DLYX_PCH_STL /DLYX_PCH_BOOST /DLYX_PCH_QT") set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /DLYX_PCH_STL /DLYX_PCH_BOOST") endmacro(lyx_add_msvc_pch) macro(lyx_add_gcc_pch name_) @@ -658,7 +716,7 @@ if(LYX_PCH) macro(lyx_add_msvc_pch name_) endmacro() macro(lyx_add_gcc_pch name_) - add_definitions(-DLYX_PCH_STL -DLYX_PCH_BOOST -DLYX_PCH_QT4) + add_definitions(-DLYX_PCH_STL -DLYX_PCH_BOOST -DLYX_PCH_QT) ADD_PRECOMPILED_HEADER(${name_} ${TOP_BINARY_DIR}/config_pch.cpp ${TOP_BINARY_DIR}/config.h.gch) endmacro() endif() @@ -782,12 +840,23 @@ endif () add_custom_target (lyx_run_tests COMMAND ${cmd}) set_target_properties(lyx_run_tests PROPERTIES FOLDER "tests") +if(LYX_ASAN) + set(LYX_CXX_FLAGS "-fsanitize=address -fno-omit-frame-pointer -g") + message(STATUS) + message(STATUS "Address sanitizer enabled. Usage:") + message(STATUS " wget https://llvm.org/svn/llvm-project/compiler-rt/trunk/lib/asan/scripts/asan_symbolize.py") + message(STATUS " chmod +x ./asan_symbolize.py") + message(STATUS " ./bin/lyx2.2 2>&1 | ./asan_symbolize.py | c++filt ") + message(STATUS) +endif() if(LYX_INSTALL) if(${LYX_PYTHON_EXECUTABLE} MATCHES "-NOTFOUND") message(STATUS "Python required to create doc!") else() - add_subdirectory(${LYX_CMAKE_DIR}/man "${TOP_BINARY_DIR}/man") + if(UNIX) + add_subdirectory(${LYX_CMAKE_DIR}/man "${TOP_BINARY_DIR}/man") + endif() add_subdirectory(${LYX_CMAKE_DIR}/doc "${TOP_BINARY_DIR}/doc") endif() include(../Install) @@ -804,8 +873,9 @@ if(LYX_ENABLE_URLTESTS) endif() message(STATUS) -message(STATUS "Build options, switch LYX_* variables by -DLYX_*=ON or OFF:") +message(STATUS "Build params, switch LYX_* options by -DLYX_*=ON or OFF, LYX_* combos by -DLYX_*=value:") message(STATUS) + LYX_OPTION_LIST_ALL(used) @@ -822,13 +892,15 @@ if(LYX_NLS) message(STATUS) endif() -if(NOT Spelling_FOUND) +# Apple has builtin native spell checker, +# no need to warn for missing Aspell, Hunspell or Enchant +if(NOT Spelling_FOUND AND NOT APPLE) if(LYX_REQUIRE_SPELLCHECK) set(_mode "FATAL_ERROR") else() set(_mode "STATUS") endif() - message(${_mode} "No spellcheck libraries found. Lyx will be unable use spellchecking") + message(${_mode} "No spellcheck libraries found. LyX will be unable use spellchecking") endif() include("${TOP_CMAKE_PATH}/LyxPackaging.cmake")