From 34413cbf3f578971b66da3fbf24539656d850b33 Mon Sep 17 00:00:00 2001
From: Cristian Adam <cristian.adam@gmail.com>
Date: Fri, 31 Jan 2020 18:40:42 +0100
Subject: cmArchiveWrite: Remove ./ suffix from 7zip archives

Fixes: #20297
---
 Source/cmArchiveWrite.cxx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index f8d1aa7..d29b2ac 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -200,7 +200,8 @@ bool cmArchiveWrite::Add(std::string path, size_t skip, const char* prefix,
 bool cmArchiveWrite::AddPath(const char* path, size_t skip, const char* prefix,
                              bool recursive)
 {
-  if (strcmp(path, ".") != 0 || this->Format != "zip") {
+  if (strcmp(path, ".") != 0 ||
+      (this->Format != "zip" && this->Format != "7zip")) {
     if (!this->AddFile(path, skip, prefix)) {
       return false;
     }
@@ -212,7 +213,7 @@ bool cmArchiveWrite::AddPath(const char* path, size_t skip, const char* prefix,
   cmsys::Directory d;
   if (d.Load(path)) {
     std::string next = cmStrCat(path, '/');
-    if (next == "./" && this->Format == "zip") {
+    if (next == "./" && (this->Format == "zip" || this->Format == "7zip")) {
       next.clear();
     }
     std::string::size_type end = next.size();
-- 
cgit v0.12