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

Amend(1) 689f26d2: Add default path to server pipe (cmake build)

Browse Source 
Added handling for cygwin and win32
MacOSX is unchanged, Stephan could you look at it?
This commit is contained in:
Kornel Benko 2020-04-18 09:06:56 +02:00
parent 9e71bdfd32
commit 0135682fca
3 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
development/cmake/Install.cmake
View File

@ -130,6 +130,10 @@ lyx_install("data" ${TOP_SRC_DIR}/lib . * .)
lyx_install("data" ${TOP_SRC_DIR}/3rdparty scripts/evince_sync * .)
# Install
set(lyxrcorig "")
set(program_suffix ${PROGRAM_SUFFIX})
set(version_suffix ${PROGRAM_SUFFIX})
if(APPLE)
if(LYX_BUNDLE)
install(FILES ${TOP_SRC_DIR}/development/MacOSX/spotlight/Info.plist DESTINATION "${MACOSX_BUNDLE_STARTUP_COMMAND}/Contents/Library/Spotlight/LyX-Metadata.mdimporter/Contents")
@ -140,15 +144,20 @@ if(APPLE)
install(PROGRAMS "${TOP_SRC_DIR}/development/MacOSX/${_i}" DESTINATION "${LYX_UTILITIES_INSTALL_PATH}")
endforeach()
install(FILES "${TOP_SRC_DIR}/development/MacOSX/LyX.icns" DESTINATION "${LYX_DATA_SUBDIR}")
set(program_suffix ${PROGRAM_SUFFIX})
configure_file("${TOP_SRC_DIR}/development/MacOSX/lyxrc.dist.in" lyxrc.dist)
lyx_install("data" ${CMAKE_CURRENT_BINARY_DIR} . lyxrc.dist .)
set(lyxrcorig "${TOP_SRC_DIR}/development/MacOSX/lyxrc.dist.in")
elseif(UNIX)
set(program_suffix ${PROGRAM_SUFFIX})
configure_file(${TOP_SRC_DIR}/lib/lyx.desktop.in lyx${PROGRAM_SUFFIX}.desktop)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lyx${PROGRAM_SUFFIX}.desktop DESTINATION ${SYSTEM_DATADIR}/applications)
install(FILES ${TOP_SRC_DIR}/lib/images/lyx.svg RENAME lyx${PROGRAM_SUFFIX}.svg DESTINATION ${SYSTEM_DATADIR}/icons/hicolor/scalable/apps/)
configure_file(${TOP_SRC_DIR}/development/unix/lyxrc.dist.in lyxrc.dist)
set(lyxrcorig "${TOP_SRC_DIR}/development/unix/lyxrc.dist.in")
elseif(CYGWIN)
set(lyxrcorig "${TOP_SRC_DIR}/development/cygwin/lyxrc.dist.in")
elseif(WIN32)
set(lyxrcorig "${TOP_SRC_DIR}/development/win32/lyxrc.dist.in")
endif()
if(NOT lyxrcorig STREQUAL "")
configure_file("${lyxrcorig}" lyxrc.dist)
lyx_install("data" ${CMAKE_CURRENT_BINARY_DIR} . lyxrc.dist .)
endif()
@ -156,7 +165,6 @@ if(USE_POSIX_PACKAGING AND EXISTS "${TOP_SRC_DIR}/lib/usr.bin.lyxwrap.in")
# handle lyxwrap
#get_filename_component(prefix "${CMAKE_INSTALL_PREFIX}" REALPATH)
set(prefix "${CMAKE_INSTALL_PREFIX}")
set(version_suffix ${PROGRAM_SUFFIX})
string(REGEX REPLACE "^/" "" lyxwrapprefix1 "${prefix}")
string(REPLACE "/" "." lyxwrapprefix ${lyxwrapprefix1})
#message(STATUS "lyxwrapprefix = ${lyxwrapprefix}")

2
development/cygwin/lyxrc.dist.in
View File

@ -18,5 +18,5 @@ Format 22
\screen_font_sans "Arial"
\screen_font_typewriter "Courier New"
\preview_scale_factor 1.0
\serverpipe "~/.lyx@version_suffix@/lyxpipe"
\serverpipe "$$User/lyxpipe"
\path_prefix "/usr/local/bin:/usr/bin:/usr/X11R6/bin"

16
development/win32/lyxrc.dist.in Normal file
View File

@ -0,0 +1,16 @@
### This file is part of
### ========================================================
### LyX, The Document Processor
###
### Copyright 1995 Matthias Ettrich
### Copyright 1995-2018 The LyX Team.
###
### ========================================================
# This file is written by LyX, if you want to make your own
# modifications you should do them from inside LyX and save
Format 25
\serverpipe "$$User/.lyxpipe"