Good time to update my CMake fork....