diff options
| author | Martin Braun <martin.braun@ettus.com> | 2014-10-24 16:31:44 +0200 |
|---|---|---|
| committer | Sebastian Koslowski <koslowski@kit.edu> | 2014-11-04 15:22:24 +0100 |
| commit | be9b7a1644fc55ecd0a18085affb64307db53534 (patch) | |
| tree | 62129d0c8a398d14bbe179ed59d4e7248ec148fc /grc | |
| parent | e4873df6d040b2e559d1ae9135627e0ca7f2a6c9 (diff) | |
grc: On Linux, respect x-terminal-emulator
Diffstat (limited to 'grc')
| -rw-r--r-- | grc/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | grc/grc.conf.in | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index 05c1293aa0..cbf4c9945d 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -68,6 +68,16 @@ CPACK_COMPONENT("grc" ######################################################################## file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/${GRC_BLOCKS_DIR} blocksdir) +if (APPLE) + set(GRC_XTERM_EXE "xterm") +elseif(CYGWIN) + set(GRC_XTERM_EXE "xterm") +elseif(UNIX) + set(GRC_XTERM_EXE "x-terminal-emulator") +else() + set(GRC_XTERM_EXE "xterm") +endif() + configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/grc.conf.in ${CMAKE_CURRENT_BINARY_DIR}/grc.conf diff --git a/grc/grc.conf.in b/grc/grc.conf.in index e539d6c7f2..99ae9caff5 100644 --- a/grc/grc.conf.in +++ b/grc/grc.conf.in @@ -5,4 +5,4 @@ [grc] global_blocks_path = @blocksdir@ local_blocks_path = -xterm_executable = xterm +xterm_executable = @GRC_XTERM_EXE@ |