Split out setting of default values for VESPA_UNPRIVILEGED,

CMAKE_INSTALL_PREFIX and VESPA_USER.

1 files changed, 38 insertions, 35 deletions

diff --git a/default_build_settings.cmake b/default_build_settings.cmake
index fb2500d07be..d6781f14e75 100644
--- a/default_build_settings.cmake
+++ b/default_build_settings.cmake
@@ -87,9 +87,45 @@ function(setup_vespa_default_build_settings_ubuntu_18_10)
   set(DEFAULT_VESPA_LLVM_VERSION "6.0" PARENT_SCOPE)
 endfunction()
 
+function(vespa_use_default_vespa_unprivileged)
+  if(NOT DEFINED VESPA_UNPRIVILEGED)
+    message("-- Setting VESPA_UNPRIVILEGED to yes")
+    set(VESPA_UNPRIVILEGED "yes" PARENT_SCOPE)
+  endif()
+endfunction()
+
+function(vespa_use_default_cmake_install_prefix)
+  if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    if(VESPA_UNPRIVILEGED STREQUAL "no")
+      set(DEFAULT_CMAKE_INSTALL_PREFIX "/opt/vespa")
+      if(COMMAND vespa_use_specific_install_prefix)
+        vespa_use_specific_install_prefix()
+      endif()	 
+    else()
+      set(DEFAULT_CMAKE_INSTALL_PREFIX "$ENV{HOME}/vespa")
+    endif()
+    message("-- Setting CMAKE_INSTALL_PREFIX to ${DEFAULT_CMAKE_INSTALL_PREFIX}")
+    set(CMAKE_INSTALL_PREFIX "${DEFAULT_CMAKE_INSTALL_PREFIX}" CACHE PATH "Install prefix for vespa project" FORCE)
+  endif()
+endfunction()
+
+function(vespa_use_default_vespa_user)
+  if(NOT DEFINED VESPA_USER)
+    if(VESPA_UNPRIVILEGED STREQUAL "no")
+      set(DEFAULT_VESPA_USER "vespa")
+      if(COMMAND vespa_use_specific_vespa_user)
+        vespa_use_specific_vespa_user()
+      endif()
+    else()
+      set(DEFAULT_VESPA_USER "$ENV{USER}")
+    endif()
+    message("-- Setting VESPA_USER to ${DEFAULT_VESPA_USER}")
+    set(VESPA_USER "${DEFAULT_VESPA_USER}" PARENT_SCOPE)
+  endif()
+endfunction()
+
 function(vespa_use_default_build_settings)
-  if (DEFINED CMAKE_INSTALL_PREFIX AND DEFINED CMAKE_PREFIX_PATH AND
-      NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND
+  if (DEFINED CMAKE_PREFIX_PATH AND
       DEFINED VESPA_LLVM_VERSION AND
       DEFINED EXTRA_INCLUDE_DIRECTORY AND DEFINED EXTRA_LINK_DIRECTORY AND
       DEFINED CMAKE_INSTALL_RPATH AND DEFINED CMAKE_BUILD_RPATH)
@@ -100,26 +136,7 @@ function(vespa_use_default_build_settings)
   unset(DEFAULT_CMAKE_PREFIX_PATH)
   unset(DEFAULT_EXTRA_LINK_DIRECTORY)
   unset(DEFAULT_EXTRA_INCLUDE_DIRECTORY)
-  unset(DEFAULT_VESPA_USER)
   unset(DEFAULT_VESPA_CPU_ARCH_FLAGS)
-  if(NOT DEFINED VESPA_UNPRIVILEGED)
-    message("-- Setting VESPA_UNPRIVILEGED to yes")
-    set(VESPA_UNPRIVILEGED "yes" PARENT_SCOPE)
-    set(VESPA_UNPRIVILEGED "yes")
-  endif()
-  if(VESPA_UNPRIVILEGED STREQUAL "no")
-    set(DEFAULT_CMAKE_INSTALL_PREFIX "/opt/vespa")
-    set(DEFAULT_VESPA_USER "vespa")
-    if(COMMAND vespa_use_specific_install_prefix)
-      vespa_use_specific_install_prefix()
-    endif()
-    if(COMMAND vespa_use_specific_vespa_user)
-      vespa_use_specific_vespa_user()
-    endif()
-  else()
-    set(DEFAULT_CMAKE_INSTALL_PREFIX "$ENV{HOME}/vespa")
-    set(DEFAULT_VESPA_USER "$ENV{USER}")
-  endif()
   if(APPLE)
     if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
       set(VESPA_DEPS "/opt/vespa-deps-clang")
@@ -180,9 +197,6 @@ function(vespa_use_default_build_settings)
       set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-mtune=intel")
     endif()
   endif()
-  if(DEFINED DEFAULT_CMAKE_INSTALL_PREFIX)
-    message("-- DEFAULT_CMAKE_INSTALL_PREFIX is ${DEFAULT_CMAKE_INSTALL_PREFIX}")
-  endif()
   if(DEFINED DEFAULT_CMAKE_PREFIX_PATH)
     message("-- DEFAULT_CMAKE_PREFIX_PATH is ${DEFAULT_CMAKE_PREFIX_PATH}")
   endif()
@@ -195,14 +209,7 @@ function(vespa_use_default_build_settings)
   if(DEFINED DEFAULT_VESPA_LLVM_VERSION)
     message("-- DEFAULT_VESPA_LLVM_VERSION is ${DEFAULT_VESPA_LLVM_VERSION}")
   endif()
-  if(DEFINED DEFAULT_VESPA_USER)
-    message("-- DEFAULT_VESPA_USER is ${DEFAULT_VESPA_USER}")
-  endif()
   message("-- DEFAULT_VESPA_CPU_ARCH_FLAGS is ${DEFAULT_VESPA_CPU_ARCH_FLAGS}")
-  if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND DEFINED DEFAULT_CMAKE_INSTALL_PREFIX)
-    message("-- Setting CMAKE_INSTALL_PREFIX to ${DEFAULT_CMAKE_INSTALL_PREFIX}")
-    set(CMAKE_INSTALL_PREFIX "${DEFAULT_CMAKE_INSTALL_PREFIX}" CACHE PATH "Install prefix for vespa project" FORCE)
-  endif()
   if(NOT DEFINED CMAKE_PREFIX_PATH AND DEFINED DEFAULT_CMAKE_PREFIX_PATH)
     message("-- Setting CMAKE_PREFIX_PATH to ${DEFAULT_CMAKE_PREFIX_PATH}")
     set(CMAKE_PREFIX_PATH "${DEFAULT_CMAKE_PREFIX_PATH}" PARENT_SCOPE)
@@ -243,10 +250,6 @@ function(vespa_use_default_build_settings)
     message("-- Setting VESPA_LLVM_VERSION to ${DEFAULT_VESPA_LLVM_VERSION}")
     set(VESPA_LLVM_VERSION "${DEFAULT_VESPA_LLVM_VERSION}" PARENT_SCOPE)
   endif()
-  if(NOT DEFINED VESPA_USER AND DEFINED DEFAULT_VESPA_USER)
-    message("-- Setting VESPA_USER to ${DEFAULT_VESPA_USER}")
-    set(VESPA_USER "${DEFAULT_VESPA_USER}" PARENT_SCOPE)
-  endif()
   if(NOT DEFINED VESPA_CPU_ARCH_FLAGS AND DEFINED DEFAULT_VESPA_CPU_ARCH_FLAGS)
     message("-- Setting VESPA_CPU_ARCH_FLAGS to ${DEFAULT_VESPA_CPU_ARCH_FLAGS}")
     set(VESPA_CPU_ARCH_FLAGS "${DEFAULT_VESPA_CPU_ARCH_FLAGS}" PARENT_SCOPE)