From a7380e454c5e4aaa3092788272f55922a3c6e297 Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Wed, 22 Apr 2020 21:20:11 +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        | 20 --------------------
 cmake/etc/uncrustify             |  2 +-
 src/cmlib-example/CMakeLists.txt |  8 ++------
 thirdparty/myxlib                |  2 +-
 6 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8c64ff..a58ac52 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)
 
 # Qt5
 find_package(Qt5 COMPONENTS Core REQUIRED)
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 7189067..fc058d3 100644
--- a/cmake/etc/Variables.cmake
+++ b/cmake/etc/Variables.cmake
@@ -5,25 +5,5 @@ set(DOXYGEN_PROJECT_TITLE "Пример проекта приложения")
 set(DOXYGEN_GENERATE_LATEX YES)
 set(DOXYGEN_GENERATE_HTML YES)
 
-set(CPACK_GENERATOR "TXZ;DEB")
 set(CPACK_PACKAGE_CONTACT "John Doe <box@mail.domain>")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "CMLib application 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/cmake/etc/uncrustify b/cmake/etc/uncrustify
index eb34f3f..0cd764f 160000
--- a/cmake/etc/uncrustify
+++ b/cmake/etc/uncrustify
@@ -1 +1 @@
-Subproject commit eb34f3ffb32205b382c4ee56de890b5de9371fa7
+Subproject commit 0cd764fc187ab3b66cb31a5549f13b3336858894
diff --git a/src/cmlib-example/CMakeLists.txt b/src/cmlib-example/CMakeLists.txt
index 700ad28..2887c65 100644
--- a/src/cmlib-example/CMakeLists.txt
+++ b/src/cmlib-example/CMakeLists.txt
@@ -39,12 +39,8 @@ target_include_directories(${TRGT} PUBLIC $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/
 # Компоновка с библиотеками из внешнего проекта
 target_link_libraries(${TRGT} myx-qt myx-filesystem myx-base)
 
-# Имя целевого каталога и выходного файла для цели
-set_target_properties(${TRGT}
-  PROPERTIES
-  OUTPUT_NAME ${TRGT}
-  RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}
-  )
+# Имя выходного файла для цели
+set_target_properties(${TRGT} PROPERTIES OUTPUT_NAME ${TRGT})
 
 # Правила для установки
 install(TARGETS ${TRGT} COMPONENT MAIN RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/thirdparty/myxlib b/thirdparty/myxlib
index d5729fa..f550594 160000
--- a/thirdparty/myxlib
+++ b/thirdparty/myxlib
@@ -1 +1 @@
-Subproject commit d5729fa806b0b664bbe066721612235b6bc8d3da
+Subproject commit f550594b85be0e40d6368c78b4812d04597fb53e