More cmake adjustments.