Squashed 'cmake/Modules/' changes from 4e98486..711d603

711d603 update cmake things to new interface
4ea629f commit modifications from nico
a3363b3 Merge commit '22ac6e78bd6e43053b9085ac8f86f26401bb0624'
d761614 Merge commit '4e984865c1a782ddf35c8596aadf4ed89484a285'
c065dcd manual should compile again

git-subtree-dir: cmake/Modules
git-subtree-split: 711d603069fa2e95392871298448a9604ce8381a