More cmake improvements.