Implement tex2lyx -m switch (bug #8393)

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f6daf31015fc6e04005d6e81b0e27f2d96685e9..1e0b9c3ef2d3a8ed7ee15fd79baec545e5cf1042 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,9 @@
 cmake_minimum_required(VERSION 2.6.4)
 
 
-set(LYX_PROJECT lyx)
+set(LYX_PROJECT LyX)
+
+enable_testing()
 
 set(LYX_CMAKE_DIR "development/cmake")
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/${LYX_CMAKE_DIR}/modules")
@@ -71,6 +73,7 @@ LYX_OPTION_INIT()
 
 # Options for all compilers/systems
 LYX_OPTION(CPACK            "Use the CPack management (Implies LYX_INSTALL option)" OFF ALL)
+LYX_OPTION(LOCALVERSIONING  "Add version info to created package name (only used if LYX_CPACK option set)" OFF ALL)
 LYX_OPTION(INSTALL          "Build install projects/rules (implies a bunch of other options)" OFF ALL)
 LYX_OPTION(NLS              "Enable Native Language Support (NLS)" ON ALL)
 LYX_OPTION(ASPELL           "Require aspell" OFF ALL)
@@ -250,20 +253,32 @@ foreach(_c_l ${_config_lines} )
        endif()
 endforeach(_c_l)
 
-# Find the revision number and for later use
-FIND_PROGRAM(LYX_SVNVERSION svnversion)
-#message(STATUS "svnversion = ${LYX_SVNVERSION}")
-if(LYX_SVNVERSION)
-       EXECUTE_PROCESS(COMMAND ${LYX_SVNVERSION} WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE LYX_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE)
-       # We use this value also to set the package-patch-value
-       if(LYX_PACKAGE_RELEASE MATCHES "^\([0-9]+\)")
-               set(LYX_REVISION_VERSION ${CMAKE_MATCH_1})
+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" 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")
+               endif()
+               # Override the value from configure.ac, if possible
+               EXECUTE_PROCESS(COMMAND ${LYX_GITVERSION} "log" "-1" "--format=%ci"
+                       WORKING_DIRECTORY "${TOP_SRC_DIR}"
+                       OUTPUT_VARIABLE LYX_DATEtmp OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+               string(REGEX MATCH "([0-9]+-[0-9]+-[0-9]+)" LYX_DATE ${LYX_DATEtmp})
+       else()
+               set(LYX_REVISION_VERSION git) #TODO use date
        endif()
 else()
-       set(LYX_REVISION_VERSION svn) #TODO use date
+       set(LYX_REVISION_VERSION ${LYX_PATCH_VERSION})
 endif()
 
-
 if(LYX_PROGRAM_SUFFIX)
        set(PROGRAM_SUFFIX "${LYX_INSTALL_SUFFIX}")
 else()
@@ -271,6 +286,11 @@ else()
 endif()
 
 
+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()
+
 if(LYX_BUNDLE)
        set(LYX_CPACK ON)
        message(STATUS)
@@ -280,12 +300,16 @@ if(LYX_BUNDLE)
        message(STATUS "    make package")
        if(APPLE)
                set(LYX_BUILD_BUNDLE MACOSX_BUNDLE)
+               set(CPACK_BUNDLE_NAME ${PACKAGE_BASE}${PROGRAM_SUFFIX})
+               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)
                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)")
        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")
@@ -451,7 +475,6 @@ if(LYX_NLS)
                message(FATAL_ERROR "Python 2.6 needed!")
        endif()
        find_package(LyXGettext REQUIRED)
-       include_directories(${TOP_SRC_DIR}/po)
        add_subdirectory(po "${TOP_BINARY_DIR}/po")
 endif()
 
@@ -469,6 +492,12 @@ if(LYX_NLS)
        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)
 
@@ -652,6 +681,7 @@ else()
 endif()
 
 configure_file(${LYX_CMAKE_DIR}/config.h.cmake ${TOP_BINARY_DIR}/config.h)
+configure_file(${LYX_CMAKE_DIR}/lyx_date.h.cmake ${TOP_BINARY_DIR}/lyx_date.h)
 
 # Compute qt4-version from ${QTVERSION}
 if(QTVERSION MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+).*")
@@ -661,6 +691,7 @@ 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")
 
 
 if(LYX_INSTALL)
@@ -670,7 +701,9 @@ if(LYX_INSTALL)
                add_subdirectory(${LYX_CMAKE_DIR}/man "${TOP_BINARY_DIR}/man")
                add_subdirectory(${LYX_CMAKE_DIR}/doc "${TOP_BINARY_DIR}/doc")
        endif()
-       include(../Install)
+       if(NOT(LYX_BUNDLE AND APPLE))
+               include(../Install)
+       endif()
 endif()
 
 add_subdirectory(sourcedoc "${TOP_BINARY_DIR}/sourcedoc")