Makefile

@@ -28,12 +28,11 @@ pack:
 	tar acf $(BUILD_DIR)/myxx-cmake-local-$(V).tar.xz MyxxCMake
 
 upload:
-#	git tag -d $(V)
 	git tag $(V)
-	gitea-tea r c --repo cmake/myxx -t $(V) --tag $(V) \
+	tea r c --repo cmake/myxx -t $(V) --tag $(V) \
 		-a $(BUILD_DIR)/myxx-cmake_$(V).dsc \
 		-a $(BUILD_DIR)/myxx-cmake_$(V).tar.xz \
 		-a $(BUILD_DIR)/myxx-cmake_$(V)_all.deb \
 		-a $(BUILD_DIR)/myxx-cmake-local-$(V).tar.xz
 	git tag -d $(V)
-	git push --all
+	git push

MyxxCMake/MyxxCMakeConfig.cmake

@@ -3,7 +3,7 @@ cmake_policy(SET CMP0057 NEW) # IN_LIST operator
 
 get_filename_component(MYXX_CMAKE_SOURCE_DIR "${CMAKE_CURRENT_LIST_FILE}" DIRECTORY)
 
-if(NOT MYX_CMAKE_DIR)
+if(NOT MyxCMake_DIR)
   message(FATAL_ERROR "MyxxCMake library required MyxCMake to work")
 endif()
 
@@ -48,40 +48,28 @@ function(myxx)
     get_target_property(__target_type ${__iter} TYPE)
 
     if((NOT ${__target_type} STREQUAL "UTILITY") AND
+       (NOT ${__target_type} STREQUAL "INTERFACE_LIBRARY") AND
        (NOT ${__iter} MATCHES ".*_shared$" ) AND
        (NOT ${__iter} MATCHES ".*_static$" )
-    )
+     )
-      myxx_analyze_pvs_studio(${__iter})
+      myxx_code_coverage(${__iter})
       if(MYXX_CMAKE_CLANG_TIDY_FIX)
-        myxx_analyze_clang_tidy(${__iter} FIX)
-      else()
         myxx_analyze_clang_tidy(${__iter})
       endif()
-
       if(MYXX_CMAKE_CLANG_TIDY_NAMING_FIX)
-        myxx_analyze_clang_tidy_naming(${__iter} FIX)
-      else()
         myxx_analyze_clang_tidy_naming(${__iter})
       endif()
-
       if(MYXX_CMAKE_CLANG_CHECK_FIX)
-        myxx_analyze_clang_check(${__iter} FIX)
-      else()
         myxx_analyze_clang_check(${__iter})
       endif()
-
       if(MYXX_CMAKE_CLAZY_FIX)
         myxx_analyze_clazy(${__iter} FIX)
       else()
         myxx_analyze_clazy(${__iter})
       endif()
-
+      myxx_analyze_pvs_studio(${__iter})
-      if(NOT ${__target_type} STREQUAL "INTERFACE_LIBRARY")
+      myxx_add_sanitizers(${__iter})
-        myxx_code_coverage(${__iter})
-        myxx_add_sanitizers(${__iter})
-      endif()
     endif()
-
   endforeach()
 endfunction(myxx)
 

MyxxCMake/MyxxCMakeConfigVersion.cmake

@@ -1,4 +1,4 @@
-set(MYXX_CMAKE_PACKAGE_VERSION "2.4.40")
+set(MYXX_CMAKE_PACKAGE_VERSION "2.4.32")
 if(MYXX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()

MyxxCMake/lib/AnalyzePvsStudio.cmake

@@ -39,12 +39,12 @@ function(myxx_analyze_pvs_studio TARGET_NAME)
     set(ARG_MODE "GA:1,2,3;64:1,2;OP:1,2,3;CS:1,2;OWASP:1,2")
   endif()
 
-  get_target_property(target_src ${TARGET_NAME} SOURCES)
+  get_target_property(__target_sources ${TARGET_NAME} SOURCES)
-  foreach(it ${target_src})
+  foreach(__iter ${__target_sources})
-    string(FIND ${it} ${CMAKE_BINARY_DIR} pos)
+    string(FIND ${__iter} ${CMAKE_BINARY_DIR} __pos)
-    if(pos EQUAL -1)
+      if(__pos EQUAL -1)
-      list(APPEND filtered_src ${it})
+        list(APPEND __filtered_sources ${__iter})
-    endif()
+      endif()
   endforeach()
 
   pvs_studio_add_target(TARGET ${TARGET_NAME}-analyze-pvs-studio
@@ -56,16 +56,16 @@ function(myxx_analyze_pvs_studio TARGET_NAME)
     ARGS --exclude-path ${CMAKE_CURRENT_BINARY_DIR} ${ARG_ARGS}
     MODE ${ARG_MODE})
 
-  get_target_property(target_type ${TARGET_NAME} TYPE)
+  get_target_property(__target_type ${TARGET_NAME} TYPE)
-  if(${target_type} STREQUAL INTERFACE_LIBRARY)
+  if(${__target_type} STREQUAL INTERFACE_LIBRARY)
-    set(target_type INTERFACE)
+    set(__target_type INTERFACE)
   else()
-    set(target_type PRIVATE)
+    set(__target_type PRIVATE)
   endif()
   if(MSVC)
-    target_compile_options(${TARGET_NAME} BEFORE ${target_type} /FI ${ARG_HEADER})
+    target_compile_options(${TARGET_NAME} BEFORE ${__target_type} /FI ${ARG_HEADER})
   else() # GCC/Clang
-    target_compile_options(${TARGET_NAME} BEFORE ${target_type} -include ${ARG_HEADER})
+    target_compile_options(${TARGET_NAME} BEFORE ${__target_type} -include ${ARG_HEADER})
   endif()
 
   add_dependencies(${TARGET_NAME}-analyze-pvs-studio ${TARGET_NAME})

README.md

@@ -2,9 +2,9 @@
 
 ## Установка
 
-Скачать [пакет](../../../releases/download/2.4.40/myxx-cmake_2.4.40_all.deb)
+Скачать [пакет](../../../releases/download/2.4.32/myxx-cmake_2.4.32_all.deb)
-для Debian и установить его, выполнив команду `sudo dpkg -i myxx-cmake_2.4.40_all.deb`,
+для Debian и установить его, выполнив команду `sudo dpkg -i myxx-cmake_2.4.32_all.deb`,
-или [архив](../../../releases/download/2.4.40/myxx-cmake-local-2.4.40.tar.xz)
+или [архив](../../../releases/download/2.4.32/myxx-cmake-local-2.4.32.tar.xz)
 и распаковать его в каталог `$HOME/.local/share/cmake`.
 
 ## Использование

VERSION

@@ -1 +1 @@
-2.4.40
+2.4.32

debian/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
-project(myxx-cmake VERSION 2.4.40 LANGUAGES)
+project(myxx-cmake VERSION 2.4.32 LANGUAGES)
 
 include(GNUInstallDirs)
 file(WRITE ${CMAKE_SOURCE_DIR}/MyxxCMake/MyxxCMakeConfigVersion.cmake

debian/changelog

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