CMake rollup

Brings all projects in line with the latest improvements