[Commit-gnuradio] [gnuradio] 03/20: grc: have cmake find a xterm executable on UNIX

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 4d7acb977f9afb54dc15dc7526213e2032a2ea63
Author: Sebastian Koslowski <address@hidden>
Date:   Wed Aug 12 12:48:47 2015 +0200

    grc: have cmake find a xterm executable on UNIX
---
 grc/CMakeLists.txt | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt
index 3714401..859b9e9 100644
--- a/grc/CMakeLists.txt
+++ b/grc/CMakeLists.txt
@@ -72,13 +72,16 @@ if(CMAKE_INSTALL_PREFIX STREQUAL "/usr")
     set(blocksdir ${blocksdir}:/usr/local/${GRC_BLOCKS_DIR})
 endif(CMAKE_INSTALL_PREFIX STREQUAL "/usr")
 
-if (APPLE)
-    set(GRC_XTERM_EXE "xterm")
-elseif(CYGWIN)
-    set(GRC_XTERM_EXE "xterm")
-elseif(UNIX)
-    set(GRC_XTERM_EXE "x-terminal-emulator")
-else()
+if(UNIX)
+    find_program(GRC_XTERM_EXE
+        NAMES xterminal-emulator gnome-terminal konsole xterm
+        HINTS ENV PATH
+        DOC "graphical terminal emulator used in GRC's no-gui-mode"
+    )
+    if(NOT GRC_XTERM_EXE)
+        set(GRC_XTERM_EXE "")
+    endif()
+else()  # APPLE CYGWIN
     set(GRC_XTERM_EXE "xterm")
 endif()