Cmake improvements