cmMakefile: FIx up some missed hashmap conversions
Merge topic 'dev/hashmap-for-targets' into next

63db5fca cmMakefile: FIx up some missed hashmap conversions
LocalGenerator: Fix -Woverload-virtual warning
Merge topic 'dev/refactor-source-depends-in-ninja' into next

9f3d548e LocalGenerator: Fix -Woverload-virtual warning