Allow TNS_ADMIN on Mac to be set externally with no AFS (CORALCOOL-2890)

git-svn-id: file:///git/lcgcool.svndb/cool/trunk@19968 4525493e-7705-40b1-a816-d608a930855b

cmake/CORALEnvironmentHandling.cmake

@@ -23,7 +23,7 @@ macro(coral_enable_env)
 endmacro()
 
 #-------------------------------------------------------------------------------
-# coral_release_env(<SET|PREPEND|APPEND|REMOVE|UNSET|INCLUDE|TARGET|PACKAGE> <var> <value> [...repeat...])
+# coral_release_env(<DEFAULT|SET|PREPEND|APPEND|REMOVE|UNSET|INCLUDE|TARGET|PACKAGE> <var> <value> [...repeat...])
 #
 # Declare environment variables to be modified.
 # Note: this is just a wrapper around set_property, the actual logic is in
@@ -38,7 +38,7 @@ function(coral_release_env)
 endfunction()
 
 #-------------------------------------------------------------------------------
-# coral_build_env(<SET|PREPEND|APPEND|REMOVE|UNSET|INCLUDE> <var> <value> [...repeat...])
+# coral_build_env(<DEFAULT|SET|PREPEND|APPEND|REMOVE|UNSET|INCLUDE> <var> <value> [...repeat...])
 #
 # Same as coral_release_env(), but the environment is set only for building.
 #-------------------------------------------------------------------------------
@@ -51,7 +51,7 @@ function(coral_build_env)
 endfunction()
 
 #-------------------------------------------------------------------------------
-# coral_build_and_release_env(<SET|PREPEND|APPEND|REMOVE|UNSET|INCLUDE> <var> <value> [...repeat...])
+# coral_build_and_release_env(<DEFAULT|SET|PREPEND|APPEND|REMOVE|UNSET|INCLUDE> <var> <value> [...repeat...])
 #
 # Same as coral_release_env(), but the environment is set also for building.
 #-------------------------------------------------------------------------------
@@ -259,7 +259,9 @@ endmacro()
 #-------------------------------------------------------------------------------
 macro(_env_line cmd var val output)
   _root_vars_replace (${val} val_)
-  if("${cmd}_" STREQUAL "SET_")
+  if("${cmd}_" STREQUAL "DEFAULT_")
+    set(${output} "<env:default variable=\"${var}\">${val_}</env:default>")
+  elseif("${cmd}_" STREQUAL "SET_")
     set(${output} "<env:set variable=\"${var}\">${val_}</env:set>")
   elseif("${cmd}_" STREQUAL "UNSET_")
     set(${output} "<env:unset variable=\"${var}\"><env:unset>")

src/CoolTest/CMakeLists.txt

@@ -55,7 +55,8 @@ IF(NOT BINARY_TAG MATCHES "aarch64")
   coral_build_and_release_env(SET NLS_LANG american_america.WE8ISO8859P1)
   coral_build_and_release_env(SET ORA_FPU_PRECISION EXTENDED)
   if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    coral_build_and_release_env(SET TNS_ADMIN /afs/cern.ch/sw/lcg/app/releases/CORAL/internal/oracle/admin/adminNoKerberos)
+    ###coral_build_and_release_env(SET TNS_ADMIN /afs/cern.ch/sw/lcg/app/releases/CORAL/internal/oracle/admin/adminNoKerberos) # See CORALCOOL-1244
+    coral_build_and_release_env(DEFAULT TNS_ADMIN /afs/cern.ch/sw/lcg/app/releases/CORAL/internal/oracle/admin/adminNoKerberos) # See CORALCOOL-2890
   else()
     coral_build_and_release_env(SET TNS_ADMIN /afs/cern.ch/sw/lcg/app/releases/CORAL/internal/oracle/admin)
   endif()