More Cmake improvements