More cmake fixes (reading the docs helps)