Manual now builds with CMake