Enhance cmake branch