anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cmake build: Finetune some destination data paths on UNIX

Browse Source
This commit is contained in:
Kornel Benko 2016-06-10 13:38:29 +02:00
parent 6f585055d9
commit f792837531
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -430,7 +430,13 @@ if(LYX_INSTALL_PREFIX)
endif()
set(LYX_INSTALL_PREFIX ${LYX_INSTALL_PREFIX} CACHE PATH "LyX user's choice install prefix" FORCE)
if(UNIX)
set(SYSTEM_DATADIR "${CMAKE_INSTALL_PREFIX}/share")
elseif(CMAKE_INSTALL_PREFIX MATCHES "/lyx${LYX_INSTALL_SUFFIX}$")
string(REGEX REPLACE "/lyx${LYX_INSTALL_SUFFIX}$" "/share" SYSTEM_DATADIR ${CMAKE_INSTALL_PREFIX})
else()
set(SYSTEM_DATADIR "${CMAKE_INSTALL_PREFIX}")
endif()
if(LYX_PACKAGE_SUFFIX)
set(PACKAGE ${PACKAGE_BASE}${LYX_INSTALL_SUFFIX})

6
development/cmake/Install.cmake
View File

@ -12,11 +12,11 @@ endif()
#
# Special handling for ${_file_type} == "*"
# Here we try to exclude files which we do not want to install
# Depending on _what, installation goes to
# Depending on _what, installation on UNIX goes to
# data -> ${LYX_DATA_SUBDIR}
# font -> fonts/truetype/${_lyx}/
# font -> share/fonts/truetype/${_lyx}/
# bin -> bin
# tex -> texmf/tex/latex/${_lyx}/
# tex -> share/texmf/tex/latex/${_lyx}/
macro(lyx_install _what _parent_src_dir _gl_dir _file_type)
#message("checking parents ${_parent_src_dir}")
file(GLOB _dirs RELATIVE "${_parent_src_dir}" ${_parent_src_dir}/${_gl_dir})

5
development/cmake/modules/LyXDestinations.cmake
View File

@ -67,7 +67,8 @@ function(get_font_destination _result)
# "Contents/Resources/fonts/"
set(_dir "${LYX_DATA_SUBDIR}fonts/")
elseif(UNIX)
set(_dir "fonts/truetype/${_lyx}/")
# at least on ubuntu
set(_dir "share/fonts/truetype/${_lyx}/")
else()
message(FATAL_ERROR "Unhandled platform")
endif()
@ -82,7 +83,7 @@ function(get_tex_destination _result)
# "Contents/Resources/tex/"
set(_dir "${LYX_DATA_SUBDIR}tex/")
elseif(UNIX)
set(_dir "texmf/tex/latex/${_lyx}/")
set(_dir "share/texmf/tex/latex/${_lyx}/")
else()
message(FATAL_ERROR "Unhandled platform")
endif()