diff --git a/Makefile b/Makefile index 125bf34..aedcddc 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,7 @@ v: sed -i "s/VERSION \".*\"/VERSION \"$V\"/" $(TOP_DIR)/MyxxCMake/MyxxCMakeConfigVersion.cmake sed -i "s/VERSION .* LANG/VERSION $V LANG/" $(TOP_DIR)/debian/CMakeLists.txt sed -i "s/(.*)/($(V))/" $(TOP_DIR)/debian/changelog + git commit -a -m "$(V)" deb: rm -rf $(DEB_DIR) diff --git a/MyxxCMake/MyxxCMakeConfig.cmake b/MyxxCMake/MyxxCMakeConfig.cmake index 1dd0b32..178fadd 100644 --- a/MyxxCMake/MyxxCMakeConfig.cmake +++ b/MyxxCMake/MyxxCMakeConfig.cmake @@ -53,9 +53,15 @@ function(myxx) (NOT ${__iter} MATCHES ".*_static$" ) ) myxx_code_coverage(${__iter}) - myxx_analyze_clang_tidy(${__iter}) - myxx_analyze_clang_tidy_naming(${__iter}) - myxx_analyze_clang_check(${__iter}) + if(MYXX_CMAKE_CLANG_TIDY_FIX) + myxx_analyze_clang_tidy(${__iter}) + endif() + if(MYXX_CMAKE_CLANG_TIDY_NAMING_FIX) + myxx_analyze_clang_tidy_naming(${__iter}) + endif() + if(MYXX_CMAKE_CLANG_CHECK_FIX) + myxx_analyze_clang_check(${__iter}) + endif() if(MYXX_CMAKE_CLAZY_FIX) myxx_analyze_clazy(${__iter} FIX) else() diff --git a/MyxxCMake/MyxxCMakeConfigVersion.cmake b/MyxxCMake/MyxxCMakeConfigVersion.cmake index 3b00556..a1bcd1e 100644 --- a/MyxxCMake/MyxxCMakeConfigVersion.cmake +++ b/MyxxCMake/MyxxCMakeConfigVersion.cmake @@ -1,4 +1,4 @@ -set(MYXX_CMAKE_PACKAGE_VERSION "2.1.92") +set(MYXX_CMAKE_PACKAGE_VERSION "2.4.32") if(MYXX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() diff --git a/MyxxCMake/lib/AnalyzeApplyReplacements.cmake b/MyxxCMake/lib/AnalyzeApplyReplacements.cmake index 2b8a72f..96fa96d 100644 --- a/MyxxCMake/lib/AnalyzeApplyReplacements.cmake +++ b/MyxxCMake/lib/AnalyzeApplyReplacements.cmake @@ -2,7 +2,7 @@ include_guard(GLOBAL) if(NOT CLANG_APPLY_REPLACEMENTS_NAME) set(CLANG_APPLY_REPLACEMENTS_NAMES clang-apply-replacements) - foreach(V RANGE 9 18) + foreach(V RANGE 9 19) list(INSERT CLANG_APPLY_REPLACEMENTS_NAMES 0 "clang-apply-replacements-${V}") endforeach() unset(V) diff --git a/MyxxCMake/lib/AnalyzeClangCheck.cmake b/MyxxCMake/lib/AnalyzeClangCheck.cmake index 4b03290..16ce957 100644 --- a/MyxxCMake/lib/AnalyzeClangCheck.cmake +++ b/MyxxCMake/lib/AnalyzeClangCheck.cmake @@ -2,7 +2,7 @@ include_guard(GLOBAL) if(NOT CLANG_CHECK_NAME) set(CLANG_CHECK_NAMES clang-check) - foreach(V RANGE 9 18) + foreach(V RANGE 9 19) list(INSERT CLANG_CHECK_NAMES 0 "clang-check-${V}") endforeach() unset(V) diff --git a/MyxxCMake/lib/AnalyzeClangTidy.cmake b/MyxxCMake/lib/AnalyzeClangTidy.cmake index 19aa1ff..eb502c4 100644 --- a/MyxxCMake/lib/AnalyzeClangTidy.cmake +++ b/MyxxCMake/lib/AnalyzeClangTidy.cmake @@ -2,7 +2,7 @@ include_guard(GLOBAL) if(NOT CLANG_TIDY_NAME) set(CLANG_TIDY_NAMES clang-tidy) - foreach(V RANGE 9 18) + foreach(V RANGE 9 19) list(INSERT CLANG_TIDY_NAMES 0 "clang-tidy-${V}") endforeach() unset(V) diff --git a/README.md b/README.md index 4b4d08e..0472ca7 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ ## Установка -Скачать [пакет](../../../releases/download/2.1.92/myxx-cmake_2.1.92_all.deb) -для Debian и установить его, выполнив команду `sudo dpkg -i myxx-cmake_2.1.92_all.deb`, -или [архив](../../../releases/download/2.1.92/myxx-cmake-local-2.1.92.tar.xz) +Скачать [пакет](../../../releases/download/2.4.32/myxx-cmake_2.4.32_all.deb) +для Debian и установить его, выполнив команду `sudo dpkg -i myxx-cmake_2.4.32_all.deb`, +или [архив](../../../releases/download/2.4.32/myxx-cmake-local-2.4.32.tar.xz) и распаковать его в каталог `$HOME/.local/share/cmake`. ## Использование diff --git a/VERSION b/VERSION index a048613..5567f76 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.92 +2.4.32 diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt index 7529efa..01f568d 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.1.92 LANGUAGES) +project(myxx-cmake VERSION 2.4.32 LANGUAGES) include(GNUInstallDirs) file(WRITE ${CMAKE_SOURCE_DIR}/MyxxCMake/MyxxCMakeConfigVersion.cmake diff --git a/debian/changelog b/debian/changelog index da08c9b..1cb0be7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -myxx-cmake (2.1.92) unstable; urgency=medium +myxx-cmake (2.4.32) unstable; urgency=medium * New version.