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)

added Build backport run2 enhancement labels

changed the description

added lhcb-gaudi-head label

• [2020-08-13 00:12] Validation started with lhcb-new-cmake#157
• [2020-08-13 00:19] Validation started with lhcb-gaudi-head-py3#442
• [2020-08-13 00:24] Validation started with lhcb-gaudi-head#2693
• [2020-08-14 00:11] Validation started with lhcb-gaudi-head-py3#443
• [2020-08-14 00:11] Validation started with lhcb-new-cmake#158
• [2020-08-14 00:26] Validation started with lhcb-gaudi-head#2694
• [2020-08-15 00:09] Validation started with lhcb-gaudi-head-py3#444
• [2020-08-15 00:11] Validation started with lhcb-new-cmake#159
• [2020-08-15 00:13] Validation started with lhcb-gaudi-head#2695

this is probably the reason for the extra warnings the Moore build. I'll check

assigned to @rmatev and unassigned @mstahl

mentioned in merge request !2693 (merged)

mentioned in commit Rec@a159e7d9

mentioned in merge request Rec!2163 (merged)

mentioned in commit Rec@d4cacff5

added 1 commit

• 31ce7852 - Fix dependency of functor cache and GaudiConfig2

Compare with previous version

added 1 commit

• f2e0eae1 - Clean up dependency of functor cache on GaudiConfig2

Compare with previous version

changed title from Fix dependency of functor cache and GaudiConfig2 to Clean up dependency of functor cache on GaudiConfig2

changed the description

added cleanup label and removed enhancement label

assigned to @mstahl and unassigned @rmatev

resolved all threads

approved this merge request

assigned to @dcampora and unassigned @mstahl

resolved all threads

mentioned in issue Moore#203 (closed)

approved this merge request

removed lhcb-gaudi-head label

unassigned @dcampora

merged

mentioned in commit 8145acf5

picked the changes into the branch cherry-pick-8145acf5 with commit a10a68c8

mentioned in commit a10a68c8

mentioned in merge request !2709 (merged)

removed backport run2 label

mentioned in issue Moore#205 (closed)