Merge pull request #12910 from ReillyBrogan/fix-minizip-ng cmake: Fix building with system minizip-ng
