commit 3f89dd0b4864eff14db44fe8325d20124875d991
Author: Kornel Benko <[email protected]>
Date: Sun Apr 19 09:45:32 2020 +0200
Cmake build: Distinguish between PROGRAM_SUFFIX and LYX_VERSION
For instance: program suffix may be "", but lyx version is still "2.4"
---
CMakeLists.txt | 3 ++-
development/cmake/Install.cmake | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69b4d3a..2a123e7 100644
--- 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 1b7d613..f4784e0 100755
--- 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)
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
