Clean up dependency of functor cache on GaudiConfig2

The change introduced with !2537 (merged) (+ the fixed typo in !2670 (merged)) would have never worked since the MergedConfDB2 target is only added after subdirectories (and the if(TARGET MergedConfDB2) in loki_functors_cache()) are processed. In addition, it was incorrectly passed to gaudirun.py.

Here this change is effectively reverted (together with a minor code cleanup without any visible effect). The reason being that the MergedConfDB2 target isn't defined at all for some projects such as Moore. Instead of adding the dependency here, this is left to the caller of loki_functors_cache in each project (e.g. Rec!2163 (merged)).

Related to Rec!2163 (merged)

Phys/LoKiCore/cmake/LoKiFunctorsCache.cmake

@@ -99,23 +99,21 @@ function(loki_functors_cache name)
     endif()
   endforeach()
 
-  set(inputs)
+  set(inputs ${LOKI_FUNCTORS_CACHE_POST_ACTION_OPTS})
   foreach(input ${ARG_UNPARSED_ARGUMENTS})
     if((NOT IS_ABSOLUTE input) AND (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${input}))
       set(input ${CMAKE_CURRENT_SOURCE_DIR}/${input})
     endif()
     set(inputs ${inputs} ${input})
   endforeach()
-  # make sure GaudiConfig2 database has been correctly completed
-  if(TARGET MergedConfDB2)
-    list(APPEND inputs MergedConfDB2)
-  endif()
+
+  set(deps ${inputs} ${ARG_DEPENDS})
 
   set(tmp_ext pkl)
   add_custom_command(OUTPUT ${name}_srcs/${name}.${tmp_ext}
                      COMMAND ${env_cmd} --xml ${env_xml}
-                       gaudirun.py -n -o ${name}_srcs/${name}.${tmp_ext} ${inputs} ${LOKI_FUNCTORS_CACHE_POST_ACTION_OPTS}
-                     DEPENDS ${inputs} ${LOKI_FUNCTORS_CACHE_POST_ACTION_OPTS} ${ARG_DEPENDS}
+                       gaudirun.py -n -o ${name}_srcs/${name}.${tmp_ext} ${inputs}
+                     DEPENDS ${deps}
                      COMMENT "Preprocess options for ${name}")
 
   add_custom_command(OUTPUT ${outputs}