CMake fixed?... Mabye?...