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

Cmake build: Correct some installation paths

Browse Source
This commit is contained in:
Kornel Benko 2016-06-07 14:38:20 +02:00
parent 6f88e11da3
commit 9dd695b17a
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -497,9 +497,11 @@ if(LYX_BUNDLE AND APPLE)
set(LYX_MAN_DIR "${LYX_DATA_SUBDIR}" CACHE STRING "Install location for man pages.") set(LYX_MAN_DIR "${LYX_DATA_SUBDIR}" CACHE STRING "Install location for man pages.")
else() else()
if(WIN32) if(WIN32)
set(LYX_MAN_DIR "${CMAKE_BINARY_DIR}/usr/local/man/man1" CACHE STRING "Install location for man pages.") set(LYX_MAN_DIR "${CMAKE_BINARY_DIR}/usr/local/man" CACHE STRING "Install location for man pages.")
elseif(UNIX)
set(LYX_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE STRING "Install location for man pages.")
else() else()
set(LYX_MAN_DIR "${CMAKE_INSTALL_PREFIX}/man/man1" CACHE STRING "Install location for man pages.") set(LYX_MAN_DIR "${CMAKE_INSTALL_PREFIX}/man" CACHE STRING "Install location for man pages.")
endif() endif()
endif() endif()
mark_as_advanced(LYX_MAN_DIR) mark_as_advanced(LYX_MAN_DIR)

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

@ -31,9 +31,11 @@
function(get_locale_destination _result) function(get_locale_destination _result)
set(_dir) set(_dir)
if(WIN32) if(WIN32)
set(_dir "Resources/locale") # "Resources/locale"
set(_dir "${LYX_DATA_SUBDIR}locale")
elseif(APPLE) elseif(APPLE)
set(_dir "locale") # "Contents/Resources/locale"
set(_dir "${LYX_DATA_SUBDIR}locale")
elseif(UNIX) elseif(UNIX)
set(_dir "share/locale") set(_dir "share/locale")
else() else()
@ -47,6 +49,7 @@ function(get_data_destination _result)
if(WIN32) if(WIN32)
set(_dir "${LYX_DATA_SUBDIR}") set(_dir "${LYX_DATA_SUBDIR}")
elseif(APPLE) elseif(APPLE)
# "Contents/Resources/"
set(_dir "${LYX_DATA_SUBDIR}") set(_dir "${LYX_DATA_SUBDIR}")
elseif(UNIX) elseif(UNIX)
set(_dir "${LYX_DATA_SUBDIR}") set(_dir "${LYX_DATA_SUBDIR}")
@ -61,6 +64,7 @@ function(get_font_destination _result)
if(WIN32) if(WIN32)
set(_dir "${LYX_DATA_SUBDIR}fonts/") set(_dir "${LYX_DATA_SUBDIR}fonts/")
elseif(APPLE) elseif(APPLE)
# "Contents/Resources/fonts/"
set(_dir "${LYX_DATA_SUBDIR}fonts/") set(_dir "${LYX_DATA_SUBDIR}fonts/")
elseif(UNIX) elseif(UNIX)
set(_dir "fonts/truetype/${_lyx}/") set(_dir "fonts/truetype/${_lyx}/")
@ -75,6 +79,7 @@ function(get_tex_destination _result)
if(WIN32) if(WIN32)
set(_dir "${LYX_DATA_SUBDIR}tex/") set(_dir "${LYX_DATA_SUBDIR}tex/")
elseif(APPLE) elseif(APPLE)
# "Contents/Resources/tex/"
set(_dir "${LYX_DATA_SUBDIR}tex/") set(_dir "${LYX_DATA_SUBDIR}tex/")
elseif(UNIX) elseif(UNIX)
set(_dir "texmf/tex/latex/${_lyx}/") set(_dir "texmf/tex/latex/${_lyx}/")

2
src/CMakeLists.txt
View File

@ -157,7 +157,7 @@ project_source_group("${GROUP_CODE}" lyx_sources lyx_headers)
install(TARGETS ${_lyx} install(TARGETS ${_lyx}
BUNDLE DESTINATION . COMPONENT Runtime BUNDLE DESTINATION . COMPONENT Runtime
RUNTIME DESTINATION bin COMPONENT Runtime) RUNTIME DESTINATION ${LYX_UTILITIES_INSTALL_PATH} COMPONENT Runtime)
if(LYX_BUNDLE) if(LYX_BUNDLE)
if(APPLE) if(APPLE)