cmake: Add diagrams
Merge branch 'cmake-internals'
Merge remote-tracking branch 'origin/master'