More CMake adjustments.