commit 88a30d59efb81672cc01fba6bcb76211eea1ec12
Author: Kornel Benko <[email protected]>
Date: Mon Jun 8 09:52:30 2026 +0200
Cmake build: Amend(2) acd194b7
Modified patch from Guillaume Munch.
---
development/cmake/Install.cmake | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/development/cmake/Install.cmake b/development/cmake/Install.cmake
index 6d6584c474..f9267e63a4 100755
--- a/development/cmake/Install.cmake
+++ b/development/cmake/Install.cmake
@@ -2,8 +2,15 @@
# TODO: set correct path in call to cmake
# e.g. cmake /usr/src/lyx/lyx-devel/development/cmake
-DCMAKE_INSTALL_PREFIX=/usr/local -Dnls=1
-if(NOT(LYX_BUNDLE) AND APPLE)
- message(STATUS "Installing to ${CMAKE_INSTALL_PREFIX}, defined by
CMAKE_INSTALL_PREFIX")
+if (NOT(LYX_BUNDLE) AND APPLE)
+ message(STATUS "Installing to ${CMAKE_INSTALL_PREFIX}, defined by
CMAKE_INSTALL_PREFIX")
+endif()
+
+if ("${PROGRAM_SUFFIX}" MATCHES "^[0-9]+\.[0-9]+$")
+ # create PACKAGE_ID
+ string(REGEX REPLACE "[.]" "_" PACKAGE_ID "LyX${PROGRAM_SUFFIX}")
+else ()
+ set(PACKAGE_ID "LyX")
endif()
# the macro scans the directories "_parent_src_dir/_dir/_current_dir" for
*._file_type files
@@ -161,8 +168,8 @@ if(APPLE)
install(FILES "${TOP_SRC_DIR}/development/MacOSX/LyX.icns" DESTINATION
"${LYX_DATA_SUBDIR}")
set(lyxrcorig "${TOP_SRC_DIR}/development/MacOSX/lyxrc.dist.in")
elseif(UNIX)
- 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)
+ configure_file(${TOP_SRC_DIR}/lib/lyx.desktop.in ${PACKAGE_ID}.desktop)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_ID}.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/)
set(lyxrcorig "${TOP_SRC_DIR}/development/unix/lyxrc.dist.in")
elseif(CYGWIN)
@@ -190,11 +197,7 @@ if(USE_POSIX_PACKAGING AND EXISTS
"${TOP_SRC_DIR}/lib/usr.bin.lyxwrap.in")
install(FILES
"${CMAKE_CURRENT_BINARY_DIR}/${lyxwrapprefix}.${LYX_UTILITIES_INSTALL_PATH}.lyx${PROGRAM_SUFFIX}"
DESTINATION /etc/apparmor.d/)
endif()
-if ("${PROGRAM_SUFFIX}" MATCHES "^[0-9]+\.[0-9]+$")
- # create PACKAGE_ID
- string(REGEX REPLACE "[.]" "_" PACKAGE_ID "LyX_${PROGRAM_SUFFIX}")
- configure_file(${TOP_SRC_DIR}/lib/org.lyx.LyX.metainfo.xml.in
org.lyx.LyX.metainfo.xml)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.lyx.LyX.metainfo.xml
DESTINATION ${SYSTEM_DATADIR}/metainfo RENAME
org.lyx.LyX${PROGRAM_SUFFIX}.metainfo.xml)
-else()
- install(FILES ${TOP_SRC_DIR}/lib/org.lyx.LyX.metainfo.xml DESTINATION
${SYSTEM_DATADIR}/metainfo)
-endif()
+
+configure_file(${TOP_SRC_DIR}/lib/org.lyx.LyX.metainfo.xml.in
org.lyx.LyX.metainfo.xml)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.lyx.LyX.metainfo.xml DESTINATION
${SYSTEM_DATADIR}/metainfo RENAME org.lyx.${PACKAGE_ID}.metainfo.xml)
+
--
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs
