anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cmake build: Distinguish between PROGRAM_SUFFIX and LYX_VERSION

Browse Source 
For instance: program suffix may be "", but lyx version is still "2.4"
This commit is contained in:
Kornel Benko 2020-04-19 09:45:32 +02:00
parent 478a303f4a
commit 3f89dd0b48
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -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})

2
development/cmake/Install.cmake
View File

@ -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)