From 76ede7e013d94cdca2b0f18350a2da32028f18d2 Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Wed, 22 Apr 2020 21:10:45 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BA=20=D1=82=D0=B5=D0=BA=D1=83=D1=89?=
 =?UTF-8?q?=D0=B5=D0=BC=D1=83=20=D1=81=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8E=20=D0=B4=D0=BE=D0=BA=D1=83=D0=BC=D0=B5=D0=BD=D1=82?=
 =?UTF-8?q?=D0=B0=D1=86=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt                   |  2 +-
 cmake/cmlib                      |  2 +-
 cmake/etc/Variables.cmake        | 21 ---------------------
 src/cmlib-example/CMakeLists.txt |  8 ++++----
 4 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2010c01..59a2939 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ include(CMLibCommon)
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_MULTITHREADED OFF)
 set(Boost_USE_STATIC_RUNTIME ON)
-find_package(Boost 1.55.0 REQUIRED COMPONENTS headers)
+find_package(Boost 1.55.0 REQUIRED)
 
 # Автоматически генерируемый заголовочный файл
 cmlib_config_hpp_generate()
diff --git a/cmake/cmlib b/cmake/cmlib
index 0b69005..197e5b3 160000
--- a/cmake/cmlib
+++ b/cmake/cmlib
@@ -1 +1 @@
-Subproject commit 0b69005b7a05760d538c0902e634848b62f3cda1
+Subproject commit 197e5b3939709a0cc4924e44c355aa8ad7358b8e
diff --git a/cmake/etc/Variables.cmake b/cmake/etc/Variables.cmake
index 1acfb05..bf4d2b2 100644
--- a/cmake/etc/Variables.cmake
+++ b/cmake/etc/Variables.cmake
@@ -5,26 +5,5 @@ set(DOXYGEN_PROJECT_TITLE "Пример проекта для библиотек
 set(DOXYGEN_GENERATE_LATEX YES)
 set(DOXYGEN_GENERATE_HTML YES)
 
-set(CPACK_SET_DESTDIR TRUE)
-set(CPACK_GENERATOR "TXZ;DEB")
 set(CPACK_PACKAGE_CONTACT "John Doe <box@mail.domain>")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "CMake library project example")
-set(CPACK_DEBIAN_PACKAGE_SECTION "misc")
-set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
-set(CPACK_SOURCE_IGNORE_FILES
-    "${CMAKE_BINARY_DIR}"
-    "/\\\\.git/"
-    "/\\\\.gitlab-ci/"
-    "^${CMAKE_SOURCE_DIR}/.?build.?/"
-    "^${CMAKE_SOURCE_DIR}/.?output.?/"
-    "^${CMAKE_SOURCE_DIR}/files/lib"
-    "^${CMAKE_SOURCE_DIR}/files/log"
-    "\\\\.clang-tidy$"
-    "\\\\.cmake-format$"
-    "\\\\.gitignore$"
-    "\\\\.gitattributes$"
-    "\\\\.gitmodules$"
-    "\\\\.gitlab-ci.yml"
-    "CMakeLists.txt.user.*"
-    "~$"
-    "\\\\.swp$")
diff --git a/src/cmlib-example/CMakeLists.txt b/src/cmlib-example/CMakeLists.txt
index 8b285b0..857c479 100644
--- a/src/cmlib-example/CMakeLists.txt
+++ b/src/cmlib-example/CMakeLists.txt
@@ -2,13 +2,13 @@
 set(TRGT cmlib-example)
 
 # Список файлов исходных текстов
-set(TRGT_sources ${CMAKE_CURRENT_SOURCE_DIR}/init.cpp)
+set(TRGT_cpp ${CMAKE_CURRENT_SOURCE_DIR}/init.cpp)
 
 # Список заголовочных файлов (используется для установки)
-set(TRGT_headers ${CMAKE_CURRENT_SOURCE_DIR}/init.hpp)
+set(TRGT_hpp ${CMAKE_CURRENT_SOURCE_DIR}/init.hpp)
 
 # Функция для создания цели, результатом которой будет сборка библиотеки
-add_common_library(${TRGT} SOURCES ${TRGT_sources})
+add_common_library(${TRGT} SOURCES ${TRGT_cpp} ${TRGT_hpp})
 common_target_properties(${TRGT})
 
 # Добавление к пути поиска заголовочных файлов
@@ -28,7 +28,7 @@ if(BUILD_SHARED_LIBS)
 endif()
 
 # Установка заголовочных файлов
-install(FILES ${TRGT_headers} COMPONENT DEV DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${TRGT})
+install(FILES ${TRGT_hpp} COMPONENT DEV DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${TRGT})
 
 # Установка файла для pkg-config
 install(FILES ${CMAKE_BINARY_DIR}/${TRGT}.pc COMPONENT DEV DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)