Update to the newest tooling-cmake-util