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: All directory variables should contain trailing '/'

Browse Source
This commit is contained in:
Kornel Benko 2020-04-14 13:01:17 +02:00
parent 66142c7d08
commit af029d695f
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3rdparty/dtl/CMakeLists.txt vendored
View File

@ -35,5 +35,5 @@ endforeach()
# Install dtl tools in this directory to omit possible packaging conflicts # Install dtl tools in this directory to omit possible packaging conflicts
# if installing multiple lyx versions, each with own dtl executables # if installing multiple lyx versions, each with own dtl executables
get_data_destination(dest_data) get_data_destination(dest_data)
install(TARGETS ${targets} DESTINATION "${dest_data}/extratools") install(TARGETS ${targets} DESTINATION "${dest_data}extratools/")
install(FILES ${_manuals} DESTINATION ${LYX_MAN_DIR}/man1) install(FILES ${_manuals} DESTINATION "${dest_data}extraman/man1/")

7
CMakeLists.txt
View File

@ -580,15 +580,16 @@ get_locale_destination(LYX_LOCALEDIR)
set(LYX_ABS_INSTALLED_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/${LYX_LOCALEDIR}") set(LYX_ABS_INSTALLED_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/${LYX_LOCALEDIR}")
set(LYX_ABS_TOP_SRCDIR "${TOP_SRC_DIR}") set(LYX_ABS_TOP_SRCDIR "${TOP_SRC_DIR}")
unset(LYX_MAN_DIR CACHE)
if(LYX_BUNDLE AND APPLE) 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" 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) elseif(UNIX)
set(LYX_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE STRING "Install location for man pages.") 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" 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)

2
development/cmake/man/CMakeLists.txt
View File

@ -28,7 +28,7 @@ endforeach(_mn)
ADD_CUSTOM_TARGET(man ALL DEPENDS ${_manuals}) ADD_CUSTOM_TARGET(man ALL DEPENDS ${_manuals})
set_target_properties(man PROPERTIES FOLDER "doc") set_target_properties(man PROPERTIES FOLDER "doc")
install(FILES ${_manuals} DESTINATION ${LYX_MAN_DIR}/man1) install(FILES ${_manuals} DESTINATION "${LYX_MAN_DIR}man1")
# ADD_MANUALS("lyx") # ADD_MANUALS("lyx")