cmake generation fixes