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

Cmake build: Install lyx fonts in system dir too on linux

Browse Source 
1.) Math-editor seems to use system fonts, so install it there.
2.) We use fonts from the support-dir, so install them there too.

This is something automake may take int account too.
This commit is contained in:
Kornel Benko 2020-08-30 20:30:21 +02:00
parent d68f6f7f40
commit 46fca4dc1d
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
development/cmake/Install.cmake
View File

@ -24,7 +24,8 @@ macro(lyx_install _what _parent_src_dir _gl_dir _file_type)
if(NOT _dirs)
set(_dirs .)
endif()
# Select installation dir
# Select installation dir(s)
# Mark, that _dest_subdir may be a list
if ("${_what}" STREQUAL "data")
get_data_destination(_dest_subdir)
elseif ("${_what}" STREQUAL "font")
@ -78,8 +79,10 @@ macro(lyx_install _what _parent_src_dir _gl_dir _file_type)
set(_base_dir .)
endif()
install(FILES ${files_list} DESTINATION "${_dest_subdir}${_dir}/${_base_dir}")
#message(STATUS "Installing ${files_list} to ${_dest_subdir}${_dir}/${_base_dir}")
foreach(_dst ${_dest_subdir})
install(FILES ${files_list} DESTINATION "${_dst}${_dir}/${_base_dir}")
#message(STATUS "Installing ${files_list} to ${_dest_subdir}${_dir}/${_base_dir}")
endforeach()
endif()
if(program_list)
if(_glob_dir STREQUAL ".")

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

@ -68,7 +68,9 @@ function(get_font_destination _result)
set(_dir "${LYX_DATA_SUBDIR}fonts/")
elseif(UNIX)
# at least on ubuntu
set(_dir "${LYX_DATA_SUBDIR}fonts/")
# ${LYX_DATA_SUBDIR}: Satisfy lyx because GuiFontLoader.cpp searches there
# share/fonts: because math-editor uses system font
set(_dir "${LYX_DATA_SUBDIR}fonts/" "share/fonts/${_lyx}/")
else()
message(FATAL_ERROR "Unhandled platform")
endif()