From 7c5bef29133b8f0ceb188b3e6a589fe1de85780a Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Sat, 8 Oct 2022 17:25:50 +0300 Subject: [PATCH] 2.0.7 --- MyxxCMake/MyxxCMakeConfigVersion.cmake | 2 +- MyxxCMake/lib/AnalyzeClazy.cmake | 6 +++++- MyxxCMake/lib/AnalyzePvsStudio.cmake | 11 ++++++++++- README.md | 8 ++++---- VERSION | 2 +- debian/CMakeLists.txt | 2 +- debian/changelog | 2 +- 7 files changed, 23 insertions(+), 10 deletions(-) diff --git a/MyxxCMake/MyxxCMakeConfigVersion.cmake b/MyxxCMake/MyxxCMakeConfigVersion.cmake index 1a2c7f1..199c33f 100644 --- a/MyxxCMake/MyxxCMakeConfigVersion.cmake +++ b/MyxxCMake/MyxxCMakeConfigVersion.cmake @@ -1,4 +1,4 @@ -set(MYXX_CMAKE_PACKAGE_VERSION "2.0.6") +set(MYXX_CMAKE_PACKAGE_VERSION "2.0.7") if(MYXX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() diff --git a/MyxxCMake/lib/AnalyzeClazy.cmake b/MyxxCMake/lib/AnalyzeClazy.cmake index 1f36fba..7cf14fb 100644 --- a/MyxxCMake/lib/AnalyzeClazy.cmake +++ b/MyxxCMake/lib/AnalyzeClazy.cmake @@ -23,7 +23,11 @@ function(myxx_analyze_clazy target) cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) if(NOT ARG_CHECKS) - set(ARG_CHECKS "level2,container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,isempty-vs-count,qt-keywords,unneeded-cast") + set(ARG_CHECKS + "level2,container-inside-loop,detaching-member,heap-allocated-small-trivial-type,\ + isempty-vs-count,qproperty-type-mismatch,qstring-varargs,qt6-deprecated-api-fixes,\ + qt6-fwd-fixes,qt6-qlatin1stringchar-to-u,qt-keywords,signal-with-return-value,\ + thread-with-slots,tr-non-literal,unneeded-cast,use-chrono-in-qtimer") endif() set(args -checks=${ARG_CHECKS} diff --git a/MyxxCMake/lib/AnalyzePvsStudio.cmake b/MyxxCMake/lib/AnalyzePvsStudio.cmake index a37617b..a4520a0 100644 --- a/MyxxCMake/lib/AnalyzePvsStudio.cmake +++ b/MyxxCMake/lib/AnalyzePvsStudio.cmake @@ -31,11 +31,20 @@ function(myxx_analyze_pvs_studio target) endif() if(NOT ARG_MODE) - set(ARG_MODE "GA:1,2,3;64:1,2,3;OP:1,2,3;CS:1,2,3;OWASP:1,2,3") + set(ARG_MODE "GA:1,2,3;64:1,2;OP:1,2,3;CS:1,2;OWASP:1,2") endif() + get_target_property(sources ${target} SOURCES) + foreach(iter ${sources}) + string(FIND ${iter} ${CMAKE_BINARY_DIR} pos) + if(pos EQUAL -1) + list(APPEND srcs ${iter}) + endif() + endforeach() + pvs_studio_add_target(TARGET ${target}-analyze-pvs-studio ANALYZE ${target} + COMPILE_COMMANDS HIDE_HELP OUTPUT FORMAT errorfile diff --git a/README.md b/README.md index d142ef7..d18af92 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -# Библиотека дополнительных функций для CMake +# Библиотека дополнительных функций для сопровождения проекта на CMake ## Установка -Скачать [пакет](../../../releases/download/2.0.6/myxx-cmake_2.0.6_all.deb) -для Debian и установить его, выполнив команду `sudo dpkg -i myxx-cmake_2.0.6_all.deb` -или [архив](../../../releases/download/2.0.6/myxx-cmake-local-2.0.6.tar.xz) +Скачать [пакет](../../../releases/download/2.0.7/myxx-cmake_2.0.7_all.deb) +для Debian и установить его, выполнив команду `sudo dpkg -i myxx-cmake_2.0.7_all.deb`, +или [архив](../../../releases/download/2.0.7/myxx-cmake-local-2.0.7.tar.xz) и распаковать его в каталог `$HOME/.local/share/cmake`. ## Использование diff --git a/VERSION b/VERSION index 157e54f..f1547e6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.6 +2.0.7 diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt index 9041708..2f4dc88 100644 --- a/debian/CMakeLists.txt +++ b/debian/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.6 FATAL_ERROR) -project(myxx-cmake VERSION 2.0.6 LANGUAGES) +project(myxx-cmake VERSION 2.0.7 LANGUAGES) include(GNUInstallDirs) file(WRITE ${CMAKE_SOURCE_DIR}/MyxxCMake/MyxxCMakeConfigVersion.cmake diff --git a/debian/changelog b/debian/changelog index 4ce32ac..9b4fb7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -myxx-cmake (2.0.6) unstable; urgency=medium +myxx-cmake (2.0.7) unstable; urgency=medium * New version.