CMake improvements
Rectify a few things in CMake handling which have only been working accidentally (pls see the commit messages for details)
Rectify a few things in CMake handling which have only been working accidentally (pls see the commit messages for details)