Forgot to commit some cmake module changes from last night