From aee649f061e0ab7371fc7d5d5fb3334f663815d8 Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Sun, 26 Apr 2020 17:50:18 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D0=B0=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D1=84=D0=BE=D1=80=D0=BC=D0=B8=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B0=D1=80=D1=85=D0=B8=D0=B2?=
 =?UTF-8?q?=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMLibCPack.cmake    | 12 ++++++++++--
 CMLibCPackDeb.cmake |  2 --
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CMLibCPack.cmake b/CMLibCPack.cmake
index f2d6eed..501feea 100644
--- a/CMLibCPack.cmake
+++ b/CMLibCPack.cmake
@@ -5,13 +5,13 @@ set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
 
 # Параметры для архива исходных текстов
 if(NOT CPACK_SOURCE_GENERATOR)
-  set(CPACK_SOURCE_GENERATOR "TXZ")
+  set(CPACK_SOURCE_GENERATOR "TGZ")
 endif()
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMLIB_PROJECT_NAME_LOWER}-${CPACK_PACKAGE_VERSION}")
 
 # Типы генераторов для бинарных архивов
 if(NOT CPACK_GENERATOR)
-  set(CPACK_GENERATOR "TXZ" "DEB")
+  set(CPACK_GENERATOR "TGZ" "DEB")
 endif()
 
 # Параметры для архива собранного проекта
@@ -54,6 +54,14 @@ endif()
 
 set(CPACK_PROJECT_CONFIG_FILE ${CMAKE_CURRENT_LIST_DIR}/CMLibCPackProject.cmake)
 
+option(CMLIB_CPACK_DEFAULT_SCHEME "Use packaging default scheme" ON)
+
+# Правила для сборки обычных архивов
+if(CMLIB_CPACK_DEFAULT_SCHEME)
+  set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
+  set(CPACK_COMPONENTS_GROUPING IGNORE)
+endif()
+
 # Правила для сборки пакетов для Debian
 include(CMLibCPackDeb)
 
diff --git a/CMLibCPackDeb.cmake b/CMLibCPackDeb.cmake
index 6482bd5..dffdb96 100644
--- a/CMLibCPackDeb.cmake
+++ b/CMLibCPackDeb.cmake
@@ -16,8 +16,6 @@ if(NOT CPACK_DEB_COMPONENT_INSTALL)
   set(CPACK_DEB_COMPONENT_INSTALL ON)
 endif()
 
-option(CMLIB_CPACK_DEFAULT_SCHEME "Use packaging default scheme" ON)
-
 if(CMLIB_CPACK_DEFAULT_SCHEME)
   # Если имя компонента по умолчанию не определено, то устанавливается MAIN
   if(NOT CMAKE_INSTALL_DEFAULT_COMPONENT_NAME)