[Commit-gnuradio] [gnuradio] 01/02: grc: On Linux, respect x-terminal-emulator

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit be9b7a1644fc55ecd0a18085affb64307db53534
Author: Martin Braun <address@hidden>
Date:   Fri Oct 24 16:31:44 2014 +0200

    grc: On Linux, respect x-terminal-emulator
---
 grc/CMakeLists.txt | 10 ++++++++++
 grc/grc.conf.in    |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt
index 05c1293..cbf4c99 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 e539d6c..99ae9ca 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@