diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-10-08 20:28:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-08 20:28:01 -0400 |
| commit | 26a6ed55c6cf9d8ec2f2a52a787dfea7fba4fe8b (patch) | |
| tree | b991b5df5073b335ffc8a9062b78e9476ec2efb1 | |
| parent | 19840728228f66c7f2af88dfc4bcecc26ffa064b (diff) | |
| parent | 9b0b281b75b1183c0a1bb0134e7c1c8d0ae966a7 (diff) | |
| download | rneovim-26a6ed55c6cf9d8ec2f2a52a787dfea7fba4fe8b.tar.gz rneovim-26a6ed55c6cf9d8ec2f2a52a787dfea7fba4fe8b.tar.bz2 rneovim-26a6ed55c6cf9d8ec2f2a52a787dfea7fba4fe8b.zip | |
Merge pull request #5451 from jamessan/set-username-hostname
config: Allow setting USERNAME/HOSTNAME from the environment
| -rw-r--r-- | config/CMakeLists.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt index cf84f8c6a4..a16000aba8 100644 --- a/config/CMakeLists.txt +++ b/config/CMakeLists.txt @@ -142,12 +142,16 @@ configure_file ( find_program(WHOAMI_PROG whoami) find_program(HOSTNAME_PROG hostname) -if (NOT DEFINED USERNAME AND EXISTS ${WHOAMI_PROG}) +if (DEFINED ENV{USERNAME}) + set(USERNAME $ENV{USERNAME}) +elseif (NOT DEFINED USERNAME AND EXISTS ${WHOAMI_PROG}) execute_process(COMMAND ${WHOAMI_PROG} OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE USERNAME) endif() -if (EXISTS ${HOSTNAME_PROG}) +if (DEFINED ENV{HOSTNAME}) + set(HOSTNAME $ENV{HOSTNAME}) +elseif (EXISTS ${HOSTNAME_PROG}) execute_process(COMMAND ${HOSTNAME_PROG} OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE HOSTNAME) |