diff options
| author | Sebastian Koslowski <koslowski@kit.edu> | 2014-11-04 15:23:02 +0100 |
|---|---|---|
| committer | Sebastian Koslowski <koslowski@kit.edu> | 2014-11-04 15:23:02 +0100 |
| commit | 046a46cefc74b3717398d10b44fd2bcd222c272a (patch) | |
| tree | c91d1b8f81186ce156553d63429dfdc94d70741c | |
| parent | 6e3fbfd50f338932a20edbca3ba4d08e004198b5 (diff) | |
| parent | be9b7a1644fc55ecd0a18085affb64307db53534 (diff) | |
Merge branch 'maint_grcwg' into master_grcwg
| -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 c2883125b0..3714401bbb 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -72,6 +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() + 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@ |