Merge pull request #5451 from jamessan/set-username-hostname

config: Allow setting USERNAME/HOSTNAME from the environment
This commit is contained in:
James McCoy 2016-10-08 20:28:01 -04:00 committed by GitHub
commit 26a6ed55c6

View File

@ -142,12 +142,16 @@ configure_file (
find_program(WHOAMI_PROG whoami) find_program(WHOAMI_PROG whoami)
find_program(HOSTNAME_PROG hostname) 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} execute_process(COMMAND ${WHOAMI_PROG}
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
OUTPUT_VARIABLE USERNAME) OUTPUT_VARIABLE USERNAME)
endif() endif()
if (EXISTS ${HOSTNAME_PROG}) if (DEFINED ENV{HOSTNAME})
set(HOSTNAME $ENV{HOSTNAME})
elseif (EXISTS ${HOSTNAME_PROG})
execute_process(COMMAND ${HOSTNAME_PROG} execute_process(COMMAND ${HOSTNAME_PROG}
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
OUTPUT_VARIABLE HOSTNAME) OUTPUT_VARIABLE HOSTNAME)