commit 2ebcf38493b200dea94b20cc752d95565821ebc8
Author: Kornel Benko <[email protected]>
Date: Fri May 9 10:04:42 2014 +0200
Cmake build: Install lyx*.desktop and lyx*.svg files in appropriate
locations for unix
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ab1bea..fe133eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -373,13 +373,14 @@ if(LYX_INSTALL_PREFIX)
endif()
set(LYX_INSTALL_PREFIX ${LYX_INSTALL_PREFIX} CACHE PATH "LyX user's choice
install prefix" FORCE)
+string(REGEX REPLACE "/lyx${LYX_INSTALL_SUFFIX}$" "/share" SYSTEM_DATADIR
${CMAKE_INSTALL_PREFIX})
+
if(LYX_PACKAGE_SUFFIX)
set(PACKAGE ${PACKAGE_BASE}${LYX_INSTALL_SUFFIX})
else()
set(PACKAGE ${PACKAGE_BASE})
endif()
-
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
# see http://www.cmake.org/pipermail/cmake/2006-October/011559.html
if (UNIX)
diff --git a/development/cmake/Install.cmake b/development/cmake/Install.cmake
index 446d9f6..787c682 100755
--- a/development/cmake/Install.cmake
+++ b/development/cmake/Install.cmake
@@ -113,6 +113,6 @@ if(APPLE)
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 applications)
- install(FILES ${TOP_SRC_DIR}/lib/images/lyx.svg RENAME
lyx${PROGRAM_SUFFIX}.svg DESTINATION images)
+ 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/)
endif()