This commit is contained in:
Andrei Astafev 2022-10-08 17:25:50 +03:00
parent 0f2d983a15
commit 7c5bef2913
7 changed files with 23 additions and 10 deletions

View File

@ -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) if(MYXX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
set(PACKAGE_VERSION_COMPATIBLE FALSE) set(PACKAGE_VERSION_COMPATIBLE FALSE)
else() else()

View File

@ -23,7 +23,11 @@ function(myxx_analyze_clazy target)
cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
if(NOT ARG_CHECKS) 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() endif()
set(args -checks=${ARG_CHECKS} set(args -checks=${ARG_CHECKS}

View File

@ -31,11 +31,20 @@ function(myxx_analyze_pvs_studio target)
endif() endif()
if(NOT ARG_MODE) 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() 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 pvs_studio_add_target(TARGET ${target}-analyze-pvs-studio
ANALYZE ${target} ANALYZE ${target}
COMPILE_COMMANDS
HIDE_HELP HIDE_HELP
OUTPUT OUTPUT
FORMAT errorfile FORMAT errorfile

View File

@ -1,10 +1,10 @@
# Библиотека дополнительных функций для CMake # Библиотека дополнительных функций для сопровождения проекта на CMake
## Установка ## Установка
Скачать [пакет](../../../releases/download/2.0.6/myxx-cmake_2.0.6_all.deb) Скачать [пакет](../../../releases/download/2.0.7/myxx-cmake_2.0.7_all.deb)
для Debian и установить его, выполнив команду `sudo dpkg -i myxx-cmake_2.0.6_all.deb` для Debian и установить его, выполнив команду `sudo dpkg -i myxx-cmake_2.0.7_all.deb`,
или [архив](../../../releases/download/2.0.6/myxx-cmake-local-2.0.6.tar.xz) или [архив](../../../releases/download/2.0.7/myxx-cmake-local-2.0.7.tar.xz)
и распаковать его в каталог `$HOME/.local/share/cmake`. и распаковать его в каталог `$HOME/.local/share/cmake`.
## Использование ## Использование

View File

@ -1 +1 @@
2.0.6 2.0.7

View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.6 FATAL_ERROR) 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) include(GNUInstallDirs)
file(WRITE ${CMAKE_SOURCE_DIR}/MyxxCMake/MyxxCMakeConfigVersion.cmake file(WRITE ${CMAKE_SOURCE_DIR}/MyxxCMake/MyxxCMakeConfigVersion.cmake

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
myxx-cmake (2.0.6) unstable; urgency=medium myxx-cmake (2.0.7) unstable; urgency=medium
* New version. * New version.