From 1d83f14c3f2edd9bfe505f5c60937b3fbe5782de Mon Sep 17 00:00:00 2001 From: Marc Lagrange Date: Sun, 22 Feb 2009 10:00:10 +0100 Subject: [PATCH] Add wmfs.desktop and entry to install in CMakeLists.txt Signed-off-by: Marc Lagrange --- CMakeLists.txt | 20 ++++++++++++++------ wmfs.desktop | 6 ++++++ 2 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 wmfs.desktop diff --git a/CMakeLists.txt b/CMakeLists.txt index de1f1a9..920a4ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -197,6 +197,15 @@ if(GENERATE_MANPAGES) endif() endif() +# sets +# {{{ Install path and configuration variables +if(DEFINED PREFIX) + set(PREFIX ${PREFIX} CACHE PATH "install prefix") + set(CMAKE_INSTALL_PREFIX ${PREFIX}) +else() + set(PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "install prefix") +endif() + #If a sysconfdir is specified, use it instead #of the default configuration dir. if(DEFINED SYSCONFDIR) @@ -213,13 +222,11 @@ else() set(XDG_CONFIG_DIR ${SYSCONFDIR}/xdg CACHE PATH "xdg config directory") endif() -# sets -# {{{ Install path and configuration variables -if(DEFINED PREFIX) - set(PREFIX ${PREFIX} CACHE PATH "install prefix") - set(CMAKE_INSTALL_PREFIX ${PREFIX}) +# setting WMFS_XSESSION_PATH +if(DEFINED WMFS_XSESSION_PATH) + set(WMFS_XSESSION_PATH ${WMFS_XSESSION_PATH} CACHE PATH "wmfs xsessions directory") else() - set(PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "install prefix") + set(WMFS_XSESSION_PATH ${PREFIX}/share/xsessions CACHE PATH "wmfs xsessions directory") endif() # set man path @@ -327,3 +334,4 @@ endif() install(FILES ${PROJECT_TODO} ${PROJECT_README} ${PROJECT_CHANGELOG} ${PROJECT_DEFAULT_CONF} DESTINATION ${PROJECT_DATA_PATH}) install(FILES ${PROJECT_DEFAULT_CONF} DESTINATION ${WMFS_SYSCONFDIR}) +install(FILES "wmfs.desktop" DESTINATION ${WMFS_XSESSION_PATH}) diff --git a/wmfs.desktop b/wmfs.desktop new file mode 100644 index 0000000..2850f5d --- /dev/null +++ b/wmfs.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=wmfs +Comment=Window manager from scratch +TryExec=wmfs +Exec=wmfs