More cmake hackery