diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | build_settings.cmake | 4 | ||||
| -rw-r--r-- | default_build_settings.cmake | 16 |
3 files changed, 21 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 440ecb18024..4fbc756236d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,7 @@ project(vespa CXX C) vespa_use_default_vespa_unprivileged() vespa_use_default_cmake_install_prefix() vespa_use_default_vespa_user() +vespa_use_default_vespa_group() vespa_use_default_build_settings() # allows import of project in CLion on OSX diff --git a/build_settings.cmake b/build_settings.cmake index e36c56eb9e6..2bf6f93b815 100644 --- a/build_settings.cmake +++ b/build_settings.cmake @@ -178,6 +178,10 @@ else() set(VESPA_USER "vespa") endif() +if(NOT DEFINED VESPA_GROUP) + set(VESPA_GROUP "vespa") +endif() + if(VESPA_UNPRIVILEGED) else() set(VESPA_UNPRIVILEGED "no") diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 1eaaac0f1d3..009cd6d615e 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -172,6 +172,22 @@ function(vespa_use_default_vespa_user) endif() endfunction() +function(vespa_use_default_vespa_group) + if(NOT DEFINED VESPA_GROUP) + if(VESPA_UNPRIVILEGED STREQUAL "no") + set(DEFAULT_VESPA_GROUP "vespa") + if(COMMAND vespa_use_specific_vespa_group) + vespa_use_specific_vespa_group() + endif() + else() + execute_process(COMMAND id -gn ${VESPA_USER} OUTPUT_VARIABLE DEFAULT_VESPA_GROUP) + string(STRIP ${DEFAULT_VESPA_GROUP} DEFAULT_VESPA_GROUP) + endif() + message("-- Setting VESPA_GROUP to ${DEFAULT_VESPA_GROUP}") + set(VESPA_GROUP "${DEFAULT_VESPA_GROUP}" PARENT_SCOPE) + endif() +endfunction() + function(vespa_use_default_build_settings) set(VESPA_DEPS "/opt/vespa-deps") unset(DEFAULT_VESPA_LLVM_VERSION) |