Few cmake improvements