From e032a511bee1e7f306c98bcfccfad4eb833c6bee Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 22 Apr 2020 21:05:25 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BD=D1=8B=20=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B=D0=B5,=20?= =?UTF-8?q?=D1=82=D0=B0=D0=BA=20=D0=BA=D0=B0=D0=BA=20=D0=B7=D0=BD=D0=B0?= =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=BE=20=D1=83=D0=BC?= =?UTF-8?q?=D0=BE=D0=BB=D1=87=D0=B0=D0=BD=D0=B8=D1=8E=20=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D1=81=D0=B5=D0=BD=D1=8B=20=D0=B2=20CMLib?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake/cmlib | 2 +- cmake/doc | 2 +- cmake/etc/Variables.cmake | 20 -------------------- cmake/generators | 2 +- 4 files changed, 3 insertions(+), 23 deletions(-) diff --git a/cmake/cmlib b/cmake/cmlib index 4768c5e..197e5b3 160000 --- a/cmake/cmlib +++ b/cmake/cmlib @@ -1 +1 @@ -Subproject commit 4768c5efc7ce3ca9fc80baf72df303e91f348a96 +Subproject commit 197e5b3939709a0cc4924e44c355aa8ad7358b8e diff --git a/cmake/doc b/cmake/doc index 81fe901..acdfb6a 160000 --- a/cmake/doc +++ b/cmake/doc @@ -1 +1 @@ -Subproject commit 81fe90131c2d93d5d3e0f3b48c38fad0418fb953 +Subproject commit acdfb6a9dd5ca1cb037e541f7da7033968873357 diff --git a/cmake/etc/Variables.cmake b/cmake/etc/Variables.cmake index 60fee7d..63afa33 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 ") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "CMake 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/generators b/cmake/generators index c015300..74d499b 160000 --- a/cmake/generators +++ b/cmake/generators @@ -1 +1 @@ -Subproject commit c015300d63005d0d5f8a57e5b42c6d898bab94d6 +Subproject commit 74d499b9cb8600a24fb1c3ad51c57c589af38600