Implement tex2lyx -m switch (bug #8393)

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f72032714f1444d3f81e9cc9df16d3796d651f80..1e0b9c3ef2d3a8ed7ee15fd79baec545e5cf1042 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,8 @@ cmake_minimum_required(VERSION 2.6.4)
 
 set(LYX_PROJECT LyX)
 
+enable_testing()
+
 set(LYX_CMAKE_DIR "development/cmake")
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/${LYX_CMAKE_DIR}/modules")
 
@@ -264,6 +266,12 @@ if (LYX_LOCALVERSIONING)
                  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()
@@ -484,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)
 
@@ -667,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]+).*")