Make-upstream-easier-to-package cmake4