Cmake adjustments