From a332f8f85e5c3f05f29e2965073b2e3753591759 Mon Sep 17 00:00:00 2001 From: Philippe Pepiot Date: Sun, 3 May 2009 19:17:37 +0200 Subject: [PATCH] Build system: find a term for wmfsrc --- .gitignore | 1 + CMakeLists.txt | 12 +++++++++--- wmfsrc => wmfsrc.in | 4 ++-- 3 files changed, 12 insertions(+), 5 deletions(-) rename wmfsrc => wmfsrc.in (98%) diff --git a/.gitignore b/.gitignore index f6ad11d..8c7e363 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ config.h build/ doc/ wmfs.doxygen +wmfsrc diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ba34cb..2e840de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -173,13 +173,18 @@ else() set(WMFS_MAN_PATH ${PREFIX}/share/man CACHE PATH "wmfs manpage directory") endif() -# {{ Doxygen if(DOXYGEN_EXECUTABLE) add_custom_target(doc COMMAND ${DOXYGEN_EXECUTABLE} ${SOURCE_DIR}/wmfs.doxygen WORKING_DIRECTORY ${BUILD_DIR}) endif() -# }} + +find_program(URXVT_EXECUTABLE urxvt) +if(URXVT_EXECUTABLE) + set(WMFS_TERM urxvt) +else() + set(WMFS_TERM xterm) +endif() # Remplace strings in configs set(WMFS_VERSION ${VERSION}) @@ -193,7 +198,8 @@ set(WMFS_SOURCE_DIR ${SOURCE_DIR}) # Configure files set(wmfs_configure_files src/config.h.in - wmfs.doxygen.in) + wmfs.doxygen.in + wmfsrc.in) macro(a_configure_file file) string(REGEX REPLACE ".in\$" "" outfile ${file}) diff --git a/wmfsrc b/wmfsrc.in similarity index 98% rename from wmfsrc rename to wmfsrc.in index 1640a67..d62160a 100644 --- a/wmfsrc +++ b/wmfsrc.in @@ -5,7 +5,7 @@ alias { - alias term { content = "urxvt" } + alias term { content = "@WMFS_TERM@" } } misc @@ -166,7 +166,7 @@ launcher { name = "launcher_ssh" prompt = "ssh to: " - command = "urxvt -e ssh" + command = "@WMFS_TERM@ -e ssh" } }