Move to newer tooling-cmake-find-package-util