Cmake build: Distinguish between PROGRAM_SUFFIX and LYX_VERSION

For instance: program suffix may be "", but lyx version is still "2.4"

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69b4d3af187b62b263d7f94a4f26469f81fccc1a..2a123e7c34974938be7eca1d424f1db0e54dc681 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -394,6 +394,7 @@ foreach(_c_l ${_config_lines} )
                        if (NOT LYX_RELEASE_PATCH)
                                set(LYX_RELEASE_PATCH 0)
                        endif()
+                       set(LYX_VERSION "${LYX_MAJOR_VERSION}.${LYX_MINOR_VERSION}")
                        if ("${LYX_SUFFIX_VALUE}" MATCHES "")
                          set(LYX_INSTALL_SUFFIX "${LYX_MAJOR_VERSION}.${LYX_MINOR_VERSION}")
                        else()
@@ -948,7 +949,7 @@ endif()
 
 message(STATUS "")
 foreach(_v PACKAGE PACKAGE_VERSION
-       PROGRAM_SUFFIX LYX_DIR_VER LYX_USERDIR_VER
+       PROGRAM_SUFFIX LYX_VERSION LYX_DIR_VER LYX_USERDIR_VER
        LYX_ABS_TOP_SRCDIR
        LYX_ABS_INSTALLED_DATADIR LYX_ABS_INSTALLED_LOCALEDIR LYX_INSTALL_SUFFIX)
        if(NOT DEFINED ${_v})

diff --git a/development/cmake/Install.cmake b/development/cmake/Install.cmake
index 1b7d6138c29a0c6fdd28ca0777297ab1b5f598aa..f4784e079d2f3b371ec0134d143ece8c22f85686 100755 (executable)
--- a/development/cmake/Install.cmake
+++ b/development/cmake/Install.cmake
@@ -132,7 +132,7 @@ lyx_install("data" ${TOP_SRC_DIR}/3rdparty scripts/evince_sync            *
 # Install
 set(lyxrcorig "")
 set(program_suffix ${PROGRAM_SUFFIX})
-set(version_suffix ${PROGRAM_SUFFIX})
+set(version_suffix ${LYX_VERSION})
 
 if(APPLE)
   if(LYX_BUNDLE)