Merge topic 'libarchive-encoding' into next

be1e045f cmSystemTools: Fix function call paren balance in conditional block
cmSystemTools: Fix function call paren balance in conditional block

Move the close paren outside the conditions to avoid having two close
parens for one open paren.
cmArchiveWrite: Fix archive_entry_copy_pathname call to use dest

In cmArchiveWrite::AddFile, set the pathname to 'dest', not 'file'.
Merge topic 'libarchive-encoding' into next

44febfcd cmArchiveWrite: Fix archive_entry_copy_pathname call to use dest