commit af029d695f268c8f91dd7853f87a9d5b6801701a
Author: Kornel Benko <[email protected]>
Date: Tue Apr 14 13:01:17 2020 +0200
Cmake build: All directory variables should contain trailing '/'
---
3rdparty/dtl/CMakeLists.txt | 4 ++--
CMakeLists.txt | 7 ++++---
development/cmake/man/CMakeLists.txt | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/3rdparty/dtl/CMakeLists.txt b/3rdparty/dtl/CMakeLists.txt
index 5835495..999b8a2 100644
--- a/3rdparty/dtl/CMakeLists.txt
+++ b/3rdparty/dtl/CMakeLists.txt
@@ -35,5 +35,5 @@ endforeach()
# Install dtl tools in this directory to omit possible packaging conflicts
# if installing multiple lyx versions, each with own dtl executables
get_data_destination(dest_data)
-install(TARGETS ${targets} DESTINATION "${dest_data}/extratools")
-install(FILES ${_manuals} DESTINATION ${LYX_MAN_DIR}/man1)
+install(TARGETS ${targets} DESTINATION "${dest_data}extratools/")
+install(FILES ${_manuals} DESTINATION "${dest_data}extraman/man1/")
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf1c930..c1d90f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -580,15 +580,16 @@ get_locale_destination(LYX_LOCALEDIR)
set(LYX_ABS_INSTALLED_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/${LYX_LOCALEDIR}")
set(LYX_ABS_TOP_SRCDIR "${TOP_SRC_DIR}")
+unset(LYX_MAN_DIR CACHE)
if(LYX_BUNDLE AND APPLE)
set(LYX_MAN_DIR "${LYX_DATA_SUBDIR}" CACHE STRING "Install location for
man pages.")
else()
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)
- 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()
- 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()
mark_as_advanced(LYX_MAN_DIR)
diff --git a/development/cmake/man/CMakeLists.txt
b/development/cmake/man/CMakeLists.txt
index 6b795c9..f716852 100755
--- a/development/cmake/man/CMakeLists.txt
+++ b/development/cmake/man/CMakeLists.txt
@@ -28,7 +28,7 @@ endforeach(_mn)
ADD_CUSTOM_TARGET(man ALL DEPENDS ${_manuals})
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")
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
