more CMake changes