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()
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)
cmake_policy(SET CMP0005 OLD)
+ # Installing MACOSX_BUNDLE targets requires a BUNDLE DESTINATION
+ cmake_policy(SET CMP0006 NEW)
endif()
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
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)
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)
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.
set(LYX_REVISION_VERSION ${LYX_PATCH_VERSION})
endif()
-if(LYX_PROGRAM_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 "")
+if(LYX_PROGRAM_SUFFIX AND NOT (APPLE AND LYX_BUNDLE))
set(PROGRAM_SUFFIX "${LYX_INSTALL_SUFFIX}")
-else()
- set(PROGRAM_SUFFIX "")
endif()
+set(_lyx "${PACKAGE_BASE}${PROGRAM_SUFFIX}")
+set(_tex2lyx tex2lyx${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
)
set_target_properties(lyx_version PROPERTIES FOLDER "applications")
-if(APPLE)
- set(osx_bundle_program_name ${PACKAGE_BASE}${PROGRAM_SUFFIX})
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/development/MacOSX/Info.plist.in" "${CMAKE_CURRENT_BINARY_DIR}/Info.plist")
-endif()
+# Default paths for installed utilities (tex2lyx, lyxclient, etc.)
+set(LYX_UTILITIES_INSTALL_PATH bin)
if(LYX_BUNDLE)
set(LYX_CPACK ON)
+
message(STATUS)
message(STATUS "Bundle creation is enabled (experimental):")
message(STATUS " make")
message(STATUS " make install/strip")
message(STATUS " make package")
if(APPLE)
+ set(MACOSX_BUNDLE TRUE)
+ # This sets the bundle + executable names
+ set(_lyx "${PACKAGE_BASE}${LYX_INSTALL_SUFFIX}")
+ # This sets the Info.plist executable name
+ set(osx_bundle_program_name ${_lyx})
+ # Bundle name
+ set(LYX_BUNDLE_NAME ${_lyx})
+
+ # This will contain the list of files that need to be included
+ # in the bundle and their location within the bundle
+ set(OSX_BUNDLE_FILES "${TOP_SRC_DIR}/development/MacOSX/LyX.sdef;${TOP_SRC_DIR}/development/MacOSX/LyXapp.icns;${CMAKE_BINARY_DIR}/lyxrc.dist")
+ set(OSX_BUNDLE_DIRS "Resources;Resources;Resources")
+
+ # Process Info.plist and lyxrc.dist
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/development/MacOSX/Info.plist.in" "${CMAKE_CURRENT_BINARY_DIR}/Info.plist")
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/development/MacOSX/lyxrc.dist.in" "${CMAKE_CURRENT_BINARY_DIR}/lyxrc.dist")
+
set(LYX_BUILD_BUNDLE MACOSX_BUNDLE)
- set(CPACK_BUNDLE_NAME ${PACKAGE_BASE}${PROGRAM_SUFFIX})
+ set(LYX_DATA_SUBDIR ${LYX_BUNDLE_NAME}.app/Contents/Resources/ CACHE STRING "Bundle Contents dir" FORCE)
+
+ # Variables used by CPack
+ set(CPACK_BUNDLE_NAME ${LYX_BUNDLE_NAME})
set(CPACK_BUNDLE_PLIST "${CMAKE_CURRENT_BINARY_DIR}/Info.plist")
- set(LYX_DATA_SUBDIR ${PACKAGE_BASE}${PROGRAM_SUFFIX}.app/Contents/Resources/ CACHE STRING "Bundle Contents dir" FORCE)
- set(MACOSX_BUNDLE_STARTUP_COMMAND ${PACKAGE_BASE}${PROGRAM_SUFFIX}.app)
+ set(MACOSX_BUNDLE_STARTUP_COMMAND ${LYX_BUNDLE_NAME}.app)
+
+ # Set the install paths
+ set(LYX_UTILITIES_INSTALL_PATH ${LYX_BUNDLE_NAME}.app/Contents/MacOS)
if(NOT LYX_INSTALL_PREFIX)
set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/LyX CACHE PATH "Mac bundle dir" FORCE)
set(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
endif()
# Change the owner so that the install can work
- install(CODE "set(BU_CHMOD_BUNDLE_ITEMS 1)")
+ install(CODE "set(BU_CHMOD_BUNDLE_ITEMS 1)" COMPONENT Runtime)
elseif(UNIX)
message(STATUS "To embed Qt in this bundle don't build with your system Qt:")
message(STATUS " - fix PATH so a other qmake is found by cmake")
set(LYX_ABS_INSTALLED_LOCALEDIR "${LYX_ABS_INSTALLED_DATADIR}/${LYX_DATA_SUBDIR}${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.")
+endif()
+mark_as_advanced(LYX_MAN_DIR)
if(LYX_INSTALL AND WIN32)
message(STATUS "Configuring NSIS files")
if(LYX_SHARED_LIBRARIES)
set(library_type SHARED)
else()
- set(library_type STATIC)
+ set(library_type STATIC)
endif()
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)
include_directories(${TOP_BINARY_DIR} ${TOP_SRC_DIR}/src)
if(LYX_ASPELL)
- find_package(ASPELL)
+ find_package(ASPELL REQUIRED)
include_directories(${ASPELL_INCLUDE_DIR})
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)
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}/boost)
add_subdirectory(boost "${TOP_BINARY_DIR}/boost")
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)
MATH(EXPR QT4_VERSION "(${CMAKE_MATCH_1}<<16)|(${CMAKE_MATCH_2}<<8)|${CMAKE_MATCH_3}")
endif()
-set(_lyx "${PACKAGE_BASE}${PROGRAM_SUFFIX}")
-set(_tex2lyx tex2lyx${PROGRAM_SUFFIX})
set (cmd ${CMAKE_CTEST_COMMAND})
if (MSVC)
set_target_properties(lyx_run_tests PROPERTIES FOLDER "tests")
-add_subdirectory(src "${TOP_BINARY_DIR}/src")
-add_subdirectory(lib/lyx2lyx "${TOP_BINARY_DIR}/lyx2lyx")
-add_subdirectory(lib/scripts "${TOP_BINARY_DIR}/scripts")
-add_subdirectory(lib/examples "${TOP_BINARY_DIR}/lib/examples")
-
-
if(LYX_INSTALL)
if(${LYX_PYTHON_EXECUTABLE} MATCHES "-NOTFOUND")
message(STATUS "Python required to create doc!")
add_subdirectory(${LYX_CMAKE_DIR}/man "${TOP_BINARY_DIR}/man")
add_subdirectory(${LYX_CMAKE_DIR}/doc "${TOP_BINARY_DIR}/doc")
endif()
- if(NOT(LYX_BUNDLE AND APPLE))
- include(../Install)
- endif()
+ include(../Install)
endif()
+add_subdirectory(src "${TOP_BINARY_DIR}/src")
+add_subdirectory(lib/lyx2lyx "${TOP_BINARY_DIR}/lyx2lyx")
+add_subdirectory(lib/scripts "${TOP_BINARY_DIR}/scripts")
+add_subdirectory(lib/examples "${TOP_BINARY_DIR}/lib/examples")
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:")
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}")
add_custom_target(git-archive DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${DIST_NAME})
endif()
+# Last directory to be included so that the fixup code (OS X)
+# can be run last
+add_subdirectory(development/cmake/post_install)
+
message(STATUS)