diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2018-02-20 00:50:51 +0100 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@oath.com> | 2018-02-20 10:02:54 +0000 |
| commit | 0e91a768e2ccba573ad548bbc2206c2db1ca273a (patch) | |
| tree | a4c779920cc06ac18b56d2780415de3fd9218333 | |
| parent | 6d7b65adfcd1e918da8173dab25bf701074f3cdc (diff) | |
Allow override of VESPA_USER in generated default-env.txt.
| -rw-r--r-- | build_settings.cmake | 5 | ||||
| -rw-r--r-- | vespabase/conf/default-env.txt.in | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/build_settings.cmake b/build_settings.cmake index 2cccea9b64f..7616ff63ad9 100644 --- a/build_settings.cmake +++ b/build_settings.cmake @@ -81,6 +81,11 @@ else() set (VESPA_BOOST_LIB_SUFFIX "-mt-d") endif() +if(VESPA_USER) +else() + set(VESPA_USER "vespa") +endif() + if(EXTRA_INCLUDE_DIRECTORY) include_directories(SYSTEM ${EXTRA_INCLUDE_DIRECTORY}) endif() diff --git a/vespabase/conf/default-env.txt.in b/vespabase/conf/default-env.txt.in index 5b144e4c301..3551cec9945 100644 --- a/vespabase/conf/default-env.txt.in +++ b/vespabase/conf/default-env.txt.in @@ -1,3 +1,3 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. fallback VESPA_HOME @CMAKE_INSTALL_PREFIX@ -override VESPA_USER vespa +override VESPA_USER @VESPA_USER@ |