mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-09-19 14:30:32 +00:00
Cmake build: Distinguish between PROGRAM_SUFFIX and LYX_VERSION
For instance: program suffix may be "", but lyx version is still "2.4"
This commit is contained in:
parent
478a303f4a
commit
3f89dd0b48
@ -394,6 +394,7 @@ foreach(_c_l ${_config_lines} )
|
|||||||
if (NOT LYX_RELEASE_PATCH)
|
if (NOT LYX_RELEASE_PATCH)
|
||||||
set(LYX_RELEASE_PATCH 0)
|
set(LYX_RELEASE_PATCH 0)
|
||||||
endif()
|
endif()
|
||||||
|
set(LYX_VERSION "${LYX_MAJOR_VERSION}.${LYX_MINOR_VERSION}")
|
||||||
if ("${LYX_SUFFIX_VALUE}" MATCHES "")
|
if ("${LYX_SUFFIX_VALUE}" MATCHES "")
|
||||||
set(LYX_INSTALL_SUFFIX "${LYX_MAJOR_VERSION}.${LYX_MINOR_VERSION}")
|
set(LYX_INSTALL_SUFFIX "${LYX_MAJOR_VERSION}.${LYX_MINOR_VERSION}")
|
||||||
else()
|
else()
|
||||||
@ -948,7 +949,7 @@ endif()
|
|||||||
|
|
||||||
message(STATUS "")
|
message(STATUS "")
|
||||||
foreach(_v PACKAGE PACKAGE_VERSION
|
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_TOP_SRCDIR
|
||||||
LYX_ABS_INSTALLED_DATADIR LYX_ABS_INSTALLED_LOCALEDIR LYX_INSTALL_SUFFIX)
|
LYX_ABS_INSTALLED_DATADIR LYX_ABS_INSTALLED_LOCALEDIR LYX_INSTALL_SUFFIX)
|
||||||
if(NOT DEFINED ${_v})
|
if(NOT DEFINED ${_v})
|
||||||
|
@ -132,7 +132,7 @@ lyx_install("data" ${TOP_SRC_DIR}/3rdparty scripts/evince_sync *
|
|||||||
# Install
|
# Install
|
||||||
set(lyxrcorig "")
|
set(lyxrcorig "")
|
||||||
set(program_suffix ${PROGRAM_SUFFIX})
|
set(program_suffix ${PROGRAM_SUFFIX})
|
||||||
set(version_suffix ${PROGRAM_SUFFIX})
|
set(version_suffix ${LYX_VERSION})
|
||||||
|
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
if(LYX_BUNDLE)
|
if(LYX_BUNDLE)
|
||||||
|
Loading…
Reference in New Issue
Block a user