diff --git a/CMakeLists.txt b/CMakeLists.txt index 91e42d1..f3f8740 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 Gui Widgets 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 ") 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 918ac92..8017d71 100644 --- a/src/cmlib-example/CMakeLists.txt +++ b/src/cmlib-example/CMakeLists.txt @@ -80,9 +80,8 @@ target_include_directories(${TRGT} PUBLIC $