Fix #11827

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f800849c14b1a8714ce106b7995ef6efd1782c9..e4cf8bb519b5b13f79875f117d388a639c0da42e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -303,10 +303,10 @@ else()
        if(MSVC_VERSION LESS 1900)
                # Drop support for msvc versions prior to 1900 (Visual Studio 2015)
                message(FATAL_ERROR "Visual Studio >= 2015 is required.")
-       set(LYX_USE_STD_REGEX 0)
-#      if(MSVC10)
-#              set(LYX_USE_STD_REGEX 1) #TODO should we use it in ECMAScript mode?
-#      endif()
+               set(LYX_USE_STD_REGEX 0)
+       else()
+               set(LYX_USE_STD_REGEX 1)
+       endif()
 endif()
 
 
@@ -361,12 +361,19 @@ foreach(_c_l ${_config_lines} )
                setstripped(PACKAGE_BASE ${CMAKE_MATCH_1})
                setstripped(PACKAGE_VERSION ${CMAKE_MATCH_2})
                setstripped(PACKAGE_BUGREPORT ${CMAKE_MATCH_3})
-               if(PACKAGE_VERSION MATCHES "^\([0-9]+\)\\.\([0-9]+\)\(\\.\([0-9]+\)\)?.*$")
+               if(PACKAGE_VERSION MATCHES "^\([0-9]+\)\\.\([0-9]+\)\(\\.\([0-9]+\)\(\\.\([0-9]+\)\)?\)?.*$")
                        set(LYX_MAJOR_VERSION ${CMAKE_MATCH_1})
                        set(LYX_MINOR_VERSION ${CMAKE_MATCH_2})
-                       set(LYX_PATCH_VERSION ${CMAKE_MATCH_4})
+                       set(LYX_RELEASE_LEVEL ${CMAKE_MATCH_4})
+                       set(LYX_RELEASE_PATCH ${CMAKE_MATCH_6})
                        set(LYX_DIR_VER "LYX_DIR_${CMAKE_MATCH_1}${CMAKE_MATCH_2}x")
                        set(LYX_USERDIR_VER "LYX_USERDIR_${CMAKE_MATCH_1}${CMAKE_MATCH_2}x")
+                       if (NOT LYX_RELEASE_LEVEL)
+                               set(LYX_RELEASE_LEVEL 0)
+                       endif()
+                       if (NOT LYX_RELEASE_PATCH)
+                               set(LYX_RELEASE_PATCH 0)
+                       endif()
                        if ("${LYX_SUFFIX_VALUE}" MATCHES "")
                          set(LYX_INSTALL_SUFFIX "${LYX_MAJOR_VERSION}.${LYX_MINOR_VERSION}")
                        else()
@@ -381,24 +388,36 @@ endforeach(_c_l)
 
 FIND_PROGRAM(LYX_GITVERSION git)
 #message(STATUS "gitversion = ${LYX_GITVERSION}")
-set(LYX_REVISION_VERSION ${LYX_PATCH_VERSION})
-set(LYX_PACKAGE_RELEASE "1")
+set(LYX_REVISION_VERSION ${LYX_RELEASE_LEVEL})
+set(LYX_PACKAGE_RELEASE "UNDEFINED")
 if(LYX_GITVERSION)
   if (LYX_LOCALVERSIONING)
-    # Find the revision number and for later use
+    # Find the revision number for later use
     EXECUTE_PROCESS(COMMAND ${LYX_GITVERSION} describe --match 2.0.0 HEAD
-      WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE tmp_LYX_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if (tmp_LYX_PACKAGE_RELEASE MATCHES "^2\\.0\\.0\\-\([0-9]+\)\\-\(.*\)$")
-      set(LYX_PACKAGE_RELEASE ${CMAKE_MATCH_2})
-      # 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)
+      WORKING_DIRECTORY "${TOP_SRC_DIR}"
+      RESULT_VARIABLE tmp_GIT_RESULT
+      OUTPUT_VARIABLE tmp_LYX_PACKAGE_RELEASE
+      ERROR_VARIABLE tmp_GIT_ERROR
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if (tmp_GIT_RESULT EQUAL 0)
+      if (tmp_LYX_PACKAGE_RELEASE MATCHES "^2\\.0\\.0\\-\([0-9]+\)\\-\(.*\)$")
+       set(LYX_PACKAGE_RELEASE ${CMAKE_MATCH_2})
+       # 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_RELEASE_LEVEL}-${tmp_REVISION_VERSION}git")
+       set(ENABLE_DIST ON)
+      endif()
     endif()
   endif()
 endif()
+if (LYX_PACKAGE_RELEASE MATCHES "UNDEFINED")
+  set(LYX_PACKAGE_RELEASE  "1")
+  if (LYX_RELEASE_PATCH GREATER 0)
+    set(LYX_REVISION_VERSION "${LYX_RELEASE_LEVEL}.${LYX_RELEASE_PATCH}")
+  endif()
+endif()
 
 # Set the programs (lyx, tex2lyx, etc.) suffix
 # When building an OS X bundle, we will append
@@ -760,7 +779,7 @@ if(NOT LYX_EXTERNAL_HUNSPELL)
     message(STATUS "     - library: ${HUNSPELL_LIBRARY}")
 endif()
 
-foreach(_spell "ASPELL" "Enchant" "Hunspell")
+foreach(_spell "ASPELL" "ENCHANT" "HUNSPELL")
   string(TOUPPER ${_spell} _upspell)
   if (NOT ${_upspell}_FOUND)
     find_package(${_spell})