Final CMake fix. Ready to PR.