From 0f2d983a15d699325d686e4bace4f0b52daf5d50 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Fri, 7 Oct 2022 11:22:07 +0300 Subject: [PATCH] 2.0.6 --- Makefile | 3 +++ MyxxCMake/MyxxCMakeConfig.cmake | 6 +++++- MyxxCMake/MyxxCMakeConfigVersion.cmake | 2 +- MyxxCMake/lib/AnalyzePvsStudio.cmake | 2 +- MyxxCMake/lib/WarningFlags.cmake | 1 + README.md | 14 +++++++------- VERSION | 2 +- debian/CMakeLists.txt | 2 +- debian/changelog | 2 +- 9 files changed, 21 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 55f6049..125bf34 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,9 @@ DEB_DIR:=$(BUILD_DIR)/deb/myxx-cmake-$(V) all: v deb pack v: + sed -i "s/\/[0-9][0-9.]\+/\/$V/g" $(TOP_DIR)/README.md + sed -i "s/[0-9][0-9.]\+tar/$V.tar/g" $(TOP_DIR)/README.md + sed -i "s/[0-9][0-9.]\+_all/$(V)_all/g" $(TOP_DIR)/README.md sed -i "s/CMake.*REQUIRED/CMake $V REQUIRED/" $(TOP_DIR)/README.md sed -i "s/VERSION \".*\"/VERSION \"$V\"/" $(TOP_DIR)/MyxxCMake/MyxxCMakeConfigVersion.cmake sed -i "s/VERSION .* LANG/VERSION $V LANG/" $(TOP_DIR)/debian/CMakeLists.txt diff --git a/MyxxCMake/MyxxCMakeConfig.cmake b/MyxxCMake/MyxxCMakeConfig.cmake index ab0cfce..69f8057 100644 --- a/MyxxCMake/MyxxCMakeConfig.cmake +++ b/MyxxCMake/MyxxCMakeConfig.cmake @@ -48,7 +48,11 @@ function(myxx) myxx_code_coverage(${iter}) myxx_analyze_clang_tidy(${iter}) myxx_analyze_clang_check(${iter}) - myxx_analyze_clazy(${iter}) + if(MYXX_CMAKE_CLAZY_FIX) + myxx_analyze_clazy(${iter} FIX) + else() + myxx_analyze_clazy(${iter}) + endif() myxx_analyze_pvs_studio(${iter}) myxx_add_sanitizers(${iter}) endif() diff --git a/MyxxCMake/MyxxCMakeConfigVersion.cmake b/MyxxCMake/MyxxCMakeConfigVersion.cmake index ab20338..1a2c7f1 100644 --- a/MyxxCMake/MyxxCMakeConfigVersion.cmake +++ b/MyxxCMake/MyxxCMakeConfigVersion.cmake @@ -1,4 +1,4 @@ -set(MYXX_CMAKE_PACKAGE_VERSION "2.0.5") +set(MYXX_CMAKE_PACKAGE_VERSION "2.0.6") if(MYXX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() diff --git a/MyxxCMake/lib/AnalyzePvsStudio.cmake b/MyxxCMake/lib/AnalyzePvsStudio.cmake index 8ba5e6e..a37617b 100644 --- a/MyxxCMake/lib/AnalyzePvsStudio.cmake +++ b/MyxxCMake/lib/AnalyzePvsStudio.cmake @@ -35,7 +35,7 @@ function(myxx_analyze_pvs_studio target) endif() pvs_studio_add_target(TARGET ${target}-analyze-pvs-studio - ANALYZE ${target} RECURSIVE + ANALYZE ${target} HIDE_HELP OUTPUT FORMAT errorfile diff --git a/MyxxCMake/lib/WarningFlags.cmake b/MyxxCMake/lib/WarningFlags.cmake index f756e71..e7193e6 100644 --- a/MyxxCMake/lib/WarningFlags.cmake +++ b/MyxxCMake/lib/WarningFlags.cmake @@ -40,6 +40,7 @@ if(MYX_CMAKE_WARNINGS_NORMAL) check_enable_cxx_compiler_flag(-fdiagnostics-show-template-tree) if(NOT MYX_CMAKE_WARNINGS_VERBOSE) + check_enable_cxx_compiler_flag(-Wno-float-conversion) if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "5.999") check_enable_cxx_compiler_flag(-Wno-attributes) diff --git a/README.md b/README.md index 74892cb..d142ef7 100644 --- a/README.md +++ b/README.md @@ -2,18 +2,18 @@ ## Установка -Скачать [здесь](../../../releases) пакет для Debian и установить -его или архив `myxx-cmake-local` и распаковать его в каталог -`$HOME/.local/share/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) +и распаковать его в каталог `$HOME/.local/share/cmake`. ## Использование Для работы в программном проекте должна использоваться библиотека -[myx-cmake](../../../../myx), которая автоматически находит -эту библиотеку. +[myx-cmake](../../../../myx), которая автоматически находит эту библиотеку. -Для подключения функций необходимо в конце описания проекта -(после создания целей, для которых нужно применить правила) +Для подключения функций библиотеки необходимо в конце описания +проекта (после создания целей, для которых нужно применить правила) добавить строки: ```cmake diff --git a/VERSION b/VERSION index e010258..157e54f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.5 +2.0.6 diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt index 2ce6744..9041708 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.5 LANGUAGES) +project(myxx-cmake VERSION 2.0.6 LANGUAGES) include(GNUInstallDirs) file(WRITE ${CMAKE_SOURCE_DIR}/MyxxCMake/MyxxCMakeConfigVersion.cmake diff --git a/debian/changelog b/debian/changelog index 568c682..4ce32ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -myxx-cmake (2.0.5) unstable; urgency=medium +myxx-cmake (2.0.6) unstable; urgency=medium * New version.