]> git.lyx.org Git - lyx.git/blobdiff - CMakeLists.txt
Fix missing backspace in msgstr
[lyx.git] / CMakeLists.txt
index 32a3d3f45f191d9cb9ff2f09fac0749c0b17613f..a1a8cacee2ee93cd49a8fd4d8054027d2c324f48 100644 (file)
@@ -379,10 +379,10 @@ foreach(_c_l ${_config_lines} )
                        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')
+                               set(LYX_RELEASE_LEVEL 0)
                        endif()
                        if (NOT LYX_RELEASE_PATCH)
-                               set(LYX_RELEASE_PATCH '0')
+                               set(LYX_RELEASE_PATCH 0)
                        endif()
                        if ("${LYX_SUFFIX_VALUE}" MATCHES "")
                          set(LYX_INSTALL_SUFFIX "${LYX_MAJOR_VERSION}.${LYX_MINOR_VERSION}")
@@ -402,7 +402,7 @@ set(LYX_REVISION_VERSION ${LYX_RELEASE_LEVEL})
 set(LYX_PACKAGE_RELEASE "1")
 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]+\)\\-\(.*\)$")
@@ -415,6 +415,10 @@ if(LYX_GITVERSION)
       set(ENABLE_DIST ON)
     endif()
   endif()
+else()
+  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
@@ -778,7 +782,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})