More cmake fixes.