Версия 0.6.0

CI 9
CI 8
2022-04-08 15:50:39 +03:00 · 2022-04-08 15:08:56 +03:00 · 2022-04-08 15:01:01 +03:00 · 2022-04-08 14:51:23 +03:00 · 2022-04-08 14:44:49 +03:00 · 2022-04-08 13:38:56 +03:00
26 changed files with 218 additions and 147 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,4 @@
+build
 *.deb
 MyxCMake/MyxCMakeConfigVersion.cmake

--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -0,0 +1,39 @@
+include:
+  - project: 'f1x1t/gitlab-ci'
+    ref: master
+    file: 'scheduled.yml'
+
+elbrus-nightly:
+  script:
+    - ./build_deb.sh
+  extends: .scheduled-elbrus
+
+smolensk15-nightly:
+  script:
+    - ./build_deb.sh
+  extends: .scheduled-smolensk15
+
+smolensk17-nightly:
+  script:
+    - ./build_deb.sh
+  extends: .scheduled-smolensk15
+
+orel212-nightly:
+  script:
+    - ./build_deb.sh
+  extends: .scheduled-orel212
+
+bionic-nightly:
+  script:
+    - ./build_deb.sh
+  extends: .scheduled-bionic
+
+focal-nightly:
+  script:
+    - ./build_deb.sh
+  extends: .scheduled-focal
+
+jammy-nightly:
+  script:
+    - ./build_deb.sh
+  extends: .scheduled-jammy
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.0)
-project(myx-cmake VERSION 0.4.5 LANGUAGES)
+project(myx-cmake VERSION 0.6.0 LANGUAGES)

 include(GNUInstallDirs)
 file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake
--- a/MyxCMake/modules/MyxCMakeAddSharedLibrary.cmake
+++ b/MyxCMake/modules/MyxCMakeAddSharedLibrary.cmake
@ -5,6 +5,7 @@ function(myx_cmake_add_shared_library target)
  if(NOT BUILD_${_ctarget}_SHARED)
    return()
  endif()
+
  get_target_property(__target_type ${target} TYPE)
  if(NOT __target_type STREQUAL OBJECT_LIBRARY)
    myx_cmake_message_error("MyxCMake: myx_cmake_add_shared_library needs target of type OBJECT_LIBRARY")
@ -18,13 +19,14 @@ function(myx_cmake_add_shared_library target)
  add_library(${target}-shared SHARED $<TARGET_OBJECTS:${target}>)
  # cmake-format: off
  set_target_properties(${target}-shared
-    PROPERTIES OUTPUT_NAME ${__output_name}
-               VERSION ${PROJECT_VERSION}
-               SOVERSION ${PROJECT_VERSION_MAJOR}
-               LIBRARY_OUTPUT_DIRECTORY
-               ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
-  install(TARGETS ${target}-shared
-          COMPONENT main
-          LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    PROPERTIES
+      OUTPUT_NAME ${__output_name}
+      VERSION ${PROJECT_VERSION}
+      SOVERSION ${PROJECT_VERSION_MAJOR}
+      LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
+  install(TARGETS
+    ${target}-shared
+      COMPONENT main
+      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
  # cmake-format: on
 endfunction()
--- a/MyxCMake/modules/MyxCMakeAddStaticLibrary.cmake
+++ b/MyxCMake/modules/MyxCMakeAddStaticLibrary.cmake
@ -5,6 +5,7 @@ function(myx_cmake_add_static_library target)
  if(NOT BUILD_${_ctarget}_STATIC)
    return()
  endif()
+
  get_target_property(__target_type ${target} TYPE)
  if(NOT __target_type STREQUAL OBJECT_LIBRARY)
    myx_cmake_message_error("MyxCMake: myx_cmake_add_static_library needs target of type OBJECT_LIBRARY")
@ -18,10 +19,12 @@ function(myx_cmake_add_static_library target)
  add_library(${target}-static STATIC $<TARGET_OBJECTS:${target}>)
  # cmake-format: off
  set_target_properties(${target}-static
-    PROPERTIES OUTPUT_NAME ${__output_name}
-               ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
-  install(TARGETS ${target}-static
-          COMPONENT static
-          ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    PROPERTIES
+      OUTPUT_NAME ${__output_name}
+      ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
+  install(TARGETS
+    ${target}-static
+      COMPONENT static
+      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
  # cmake-format: on
 endfunction()
--- a/MyxCMake/modules/MyxCMakeBuildTypes.cmake
+++ b/MyxCMake/modules/MyxCMakeBuildTypes.cmake
@ -2,12 +2,12 @@ cmake_policy(PUSH)
 cmake_policy(SET CMP0057 NEW) # IN_LIST operator

 option(MYX_CMAKE_ENABLE_WARNING_FLAGS "Enable autodetected warning flags" ON)
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE BOOL
-  "Enable generation of compile_commands.json." FORCE)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON
+  CACHE BOOL "Enable generation of compile_commands.json" FORCE)

 # Добавление конфигурации для профилирования
 if(CMAKE_CONFIGURATION_TYPES)
-  if(NOT "Profile" IN_LIST CMAKE_CONFIGURATION_TYPES)
+  if(NOT Profile IN_LIST CMAKE_CONFIGURATION_TYPES)
    list(APPEND CMAKE_CONFIGURATION_TYPES Profile)
  endif()
 else()
@ -49,8 +49,8 @@ if(CMAKE_BUILD_TYPE STREQUAL Profile)
  elseif(CMAKE_CXX_COMPILER_IS_MSVC)
    message("Set options for profiling with Visual Studio C++")
  endif()
-  set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL
-    "Enable generation of verbose build scripts." FORCE)
+  set(CMAKE_VERBOSE_MAKEFILE ON
+    CACHE BOOL "Enable generation of verbose build scripts." FORCE)
 elseif(CMAKE_BUILD_TYPE STREQUAL Debug)
  # В режиме отладки подробный вывод сообщений компилятора
  if(CMAKE_CXX_COMPILER_IS_CLANG OR CMAKE_CXX_COMPILER_IS_GCC)
@ -68,15 +68,15 @@ elseif(CMAKE_BUILD_TYPE STREQUAL Debug)
          CACHE STRING "" FORCE)
    endif()
  endif()
-  set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL
-    "Enable generation of verbose build scripts." FORCE)
+  set(CMAKE_VERBOSE_MAKEFILE ON
+    CACHE BOOL "Enable generation of verbose build scripts." FORCE)
 elseif(CMAKE_BUILD_TYPE STREQUAL Release)
  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${MYX_CMAKE_DETECTED_CXX_FLAGS}"
-      CACHE STRING "" FORCE)
+    CACHE STRING "" FORCE)
 elseif(CMAKE_BUILD_TYPE STREQUAL None)
  # Режим None используется для статического анализа кода
-  set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL
-    "Enable generation of verbose build scripts." FORCE)
+  set(CMAKE_VERBOSE_MAKEFILE ON
+    CACHE BOOL "Enable generation of verbose build scripts." FORCE)
 endif()

 unset(_gcc_debug_flags)
--- a/MyxCMake/modules/MyxCMakeCPack.cmake
+++ b/MyxCMake/modules/MyxCMakeCPack.cmake
@ -24,23 +24,23 @@ set(CPACK_SOURCE_PACKAGE_FILE_NAME "${MYX_CMAKE_PROJECT_NAME_LOWER}-${CPACK_PACK

 # Список масок для исключения из архива исходных текстов
 set(CPACK_SOURCE_IGNORE_FILES
-    "${CPACK_SOURCE_IGNORE_FILES}"
-    "${CMAKE_BINARY_DIR}"
-    "^${CMAKE_SOURCE_DIR}/.?build.?/"
-    "^${CMAKE_SOURCE_DIR}/.?output.?/"
-    "^${CMAKE_SOURCE_DIR}/files/var"
-    "^${CMAKE_SOURCE_DIR}/files/log"
-    "CMakeLists.txt.user.*"
-    ".*.autosave"
-    ".*.status"
-    "~$"
-    "\\\\.swp$")
+  "${CPACK_SOURCE_IGNORE_FILES}"
+  "${CMAKE_BINARY_DIR}"
+  "^${CMAKE_SOURCE_DIR}/.?build.?/"
+  "^${CMAKE_SOURCE_DIR}/.?output.?/"
+  "^${CMAKE_SOURCE_DIR}/files/var"
+  "^${CMAKE_SOURCE_DIR}/files/log"
+  "CMakeLists.txt.user.*"
+  ".*.autosave"
+  ".*.status"
+  "~$"
+  "\\\\.swp$")

 option(MYX_CMAKE_COMPACT_SOURCE_PACKAGE "Make compact source package" ON)
 if(MYX_CMAKE_COMPACT_SOURCE_PACKAGE)
  # Список масок для исключения из архива исходных текстов для более компактного архива
  set(CPACK_SOURCE_IGNORE_FILES
-    "${CPACK_SOURCE_IGNORE_FILES}"
+    ${CPACK_SOURCE_IGNORE_FILES}
    "\\\\.git"
    "/\\\\.git/"
    "/\\\\.gitlab-ci/"
--- a/MyxCMake/modules/MyxCMakeCPackDeb.cmake
+++ b/MyxCMake/modules/MyxCMakeCPackDeb.cmake
@ -29,24 +29,24 @@ if(MYX_CMAKE_CPACK_DEFAULT_SCHEME)
  # Правило формирования имени пакета и файла для компонента main
  set(CPACK_DEBIAN_MAIN_PACKAGE_NAME "${MYX_CMAKE_PROJECT_NAME_LOWER}")
  set(CPACK_DEBIAN_MAIN_FILE_NAME
-      ${MYX_CMAKE_PROJECT_NAME_LOWER}_${CPACK_PACKAGE_VERSION}_${CPACK_TARGET_ARCH}.deb)
+    ${MYX_CMAKE_PROJECT_NAME_LOWER}_${CPACK_PACKAGE_VERSION}_${CPACK_TARGET_ARCH}.deb)

  # Правило формирования имени пакета и файла для компонента dev
  set(CPACK_DEBIAN_DEV_PACKAGE_NAME "lib${MYX_CMAKE_PROJECT_NAME_LOWER}-dev")
  set(CPACK_DEBIAN_DEV_FILE_NAME
-      lib${MYX_CMAKE_PROJECT_NAME_LOWER}-dev_${CPACK_PACKAGE_VERSION}_${CPACK_TARGET_ARCH}.deb)
+    lib${MYX_CMAKE_PROJECT_NAME_LOWER}-dev_${CPACK_PACKAGE_VERSION}_${CPACK_TARGET_ARCH}.deb)

  # Правило формирования имени пакета и файла для компонента static
  set(CPACK_DEBIAN_STATIC_PACKAGE_NAME "lib${MYX_CMAKE_PROJECT_NAME_LOWER}-static-dev")
  set(CPACK_DEBIAN_STATIC_FILE_NAME
-      lib${MYX_CMAKE_PROJECT_NAME_LOWER}-static-dev_${CPACK_PACKAGE_VERSION}_${CPACK_TARGET_ARCH}.deb)
+    lib${MYX_CMAKE_PROJECT_NAME_LOWER}-static-dev_${CPACK_PACKAGE_VERSION}_${CPACK_TARGET_ARCH}.deb)

  set(CPACK_DEBIAN_STATIC_PACKAGE_DEPENDS "lib${MYX_CMAKE_PROJECT_NAME_LOWER}-dev")

  # Правило формирования имени пакета и файла для компонента doc
  set(CPACK_DEBIAN_DOC_PACKAGE_NAME "${MYX_CMAKE_PROJECT_NAME_LOWER}-doc")
  set(CPACK_DEBIAN_DOC_FILE_NAME
-      ${MYX_CMAKE_PROJECT_NAME_LOWER}-doc_${CPACK_PACKAGE_VERSION}_${CPACK_TARGET_ARCH}.deb)
+    ${MYX_CMAKE_PROJECT_NAME_LOWER}-doc_${CPACK_PACKAGE_VERSION}_${CPACK_TARGET_ARCH}.deb)

  foreach(component ${CPACK_COMPONENTS_ALL})
    string(TOLOWER ${component} _cl)
@ -55,7 +55,7 @@ if(MYX_CMAKE_CPACK_DEFAULT_SCHEME)
    if(NOT ${_cl} STREQUAL main AND NOT ${_cl} STREQUAL dev AND NOT ${_cl} STREQUAL static)
      set(CPACK_DEBIAN_${_cu}_PACKAGE_NAME "${MYX_CMAKE_PROJECT_NAME_LOWER}-${_cl}")
      set(CPACK_DEBIAN_${_cu}_FILE_NAME
-          "${MYX_CMAKE_PROJECT_NAME_LOWER}-${_cl}_${CPACK_PACKAGE_VERSION}_${CPACK_TARGET_ARCH}.deb")
+        "${MYX_CMAKE_PROJECT_NAME_LOWER}-${_cl}_${CPACK_PACKAGE_VERSION}_${CPACK_TARGET_ARCH}.deb")
    endif()

    # Если в каталоге ${CMAKE_SOURCE_DIR}/cmake/deb/${_cl} находятся сценарии сопровождающего
--- a/MyxCMake/modules/MyxCMakeCodeAnalyzeClangCheck.cmake
+++ b/MyxCMake/modules/MyxCMakeCodeAnalyzeClangCheck.cmake
@ -12,7 +12,7 @@ unset(CLANG_CHECK_NAMES)

 function(myx_cmake_analyze_clang_check target)
  if(CLANG_CHECK_EXE)
-    set(_args --analyze --extra-arg="-Wno-unknown-warning-option")
+    set(_args --analyze --extra-arg=-Wno-unknown-warning-option)
    get_target_property(__sources ${target} SOURCES)
    list(FILTER __sources EXCLUDE REGEX "qrc_.*\\.cpp$")
    list(FILTER __sources EXCLUDE REGEX "moc_.*\\.cpp$")
@ -24,8 +24,9 @@ function(myx_cmake_analyze_clang_check target)
    if(NOT TARGET myx-cmake-analyze-clang-check)
      add_custom_target(myx-cmake-analyze-clang-check)
    endif()
-    add_custom_target(${target}-analyze-clang-check WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-                      COMMAND ${CLANG_CHECK_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${__sources})
+    add_custom_target(${target}-analyze-clang-check
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+      COMMAND ${CLANG_CHECK_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${__sources})
    add_dependencies(${target}-analyze-clang-check ${target})
    add_dependencies(myx-cmake-analyze-clang-check ${target}-analyze-clang-check)
  else()
--- a/MyxCMake/modules/MyxCMakeCodeAnalyzeClangTidy.cmake
+++ b/MyxCMake/modules/MyxCMakeCodeAnalyzeClangTidy.cmake
@ -24,8 +24,9 @@ function(myx_cmake_analyze_clang_tidy target)
    if(NOT TARGET myx-cmake-analyze-clang-tidy)
      add_custom_target(myx-cmake-analyze-clang-tidy)
    endif()
-    add_custom_target(${target}-analyze-clang-tidy WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-                      COMMAND ${CLANG_TIDY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${__sources})
+    add_custom_target(${target}-analyze-clang-tidy
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+      COMMAND ${CLANG_TIDY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${__sources})
    add_dependencies(${target}-analyze-clang-tidy ${target})
    add_dependencies(myx-cmake-analyze-clang-tidy ${target}-analyze-clang-tidy)
  else()
--- a/MyxCMake/modules/MyxCMakeCodeAnalyzeClazy.cmake
+++ b/MyxCMake/modules/MyxCMakeCodeAnalyzeClazy.cmake
@ -19,21 +19,22 @@ function(myx_cmake_analyze_clazy target)
    list(FILTER __sources EXCLUDE REGEX "qrc_.*\\.cpp$")
    list(FILTER __sources EXCLUDE REGEX "moc_.*\\.cpp$")
    list(FILTER __sources EXCLUDE REGEX "ui_.*\\.h$")
-    set(_args -checks=${ARG_CHECKS} -extra-arg="-Wno-unknown-warning-option"
+    set(_args -checks=${ARG_CHECKS}
+              -extra-arg=-Wno-unknown-warning-option
              -export-fixes=clazy-fixes-file.yaml)

    if(NOT TARGET myx-cmake-analyze-clazy)
      add_custom_target(myx-cmake-analyze-clazy)
    endif()
    if(MYX_CMAKE_CLAZY_FIX)
-      add_custom_target(
-        ${target}-analyze-clazy
+      add_custom_target(${target}-analyze-clazy
        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
        COMMAND ${CLAZY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${__sources}
        COMMAND ${CLANG_APPLY_REPLACEMENTS_EXE} ${CMAKE_BINARY_DIR})
    else()
-      add_custom_target(${target}-analyze-clazy WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-                        COMMAND ${CLAZY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${__sources})
+      add_custom_target(${target}-analyze-clazy
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+        COMMAND ${CLAZY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${__sources})
    endif()
    add_dependencies(${target}-analyze-clazy ${target})
    add_dependencies(myx-cmake-analyze-clazy ${target}-analyze-clazy)
--- a/MyxCMake/modules/MyxCMakeCodeCoverage.cmake
+++ b/MyxCMake/modules/MyxCMakeCodeCoverage.cmake
@ -6,29 +6,37 @@ if(MYX_CMAKE_CODE_COVERAGE)
 endif()

 function(myx_cmake_code_coverage target)
-  if(CMAKE_CXX_COMPILER_IS_GCC AND MYX_CMAKE_CODE_COVERAGE)
-    target_compile_options(${target} PUBLIC "--coverage")
-    set_property(
-      TARGET ${target}
-      APPEND_STRING
-      PROPERTY LINK_FLAGS " --coverage")
+  if(MYX_CMAKE_CODE_COVERAGE)
+    if(CMAKE_CXX_COMPILER_IS_GCC)
+      target_compile_options(${target} PUBLIC "--coverage")
+      set_property(
+        TARGET ${target}
+        APPEND_STRING
+        PROPERTY LINK_FLAGS " --coverage")
+    endif()
+    if(CMAKE_CXX_COMPILER_IS_CLANG)
+      target_compile_options(${target} PUBLIC "-fprofile-instr-generate -fcoverage-mapping")
+      set_property(
+        TARGET ${target}
+        APPEND_STRING
+        PROPERTY LINK_FLAGS " --coverage")
+    endif()

    if(LCOV_EXE)
-      add_custom_target(
-        ${target}-coverage
+      add_custom_target(${target}-coverage
        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
        COMMAND ${LCOV_EXE} --test-name ${target} --output "${target}.lcov" --capture
-                --exclude "/usr/\\\*"
-                --exclude "${CMAKE_BINARY_DIR}/\\\*"
+                --no-external
+                --base-directory ${CMAKE_SOURCE_DIR}
                --directory ${CMAKE_BINARY_DIR})
+#                --exclude "/usr/\\\*"
+#                --exclude "${CMAKE_BINARY_DIR}/\\\*"
      add_dependencies(${target}-coverage ${target})

      if(GENHTML_EXE)
-        add_custom_target(
-          ${target}-coverage-report
+        add_custom_target(${target}-coverage-report
          WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-          COMMAND ${GENHTML_EXE} --output-directory "${target}-coverage-html"
-                  "${target}.lcov")
+          COMMAND ${GENHTML_EXE} --output-directory "${target}-coverage-html" "${target}.lcov")
        add_dependencies(${target}-coverage-report ${target}-coverage)
      endif()
    endif()
--- a/MyxCMake/modules/MyxCMakeCommon.cmake
+++ b/MyxCMake/modules/MyxCMakeCommon.cmake
@ -5,8 +5,7 @@ include(MyxCMakeColoredMessages)
 include(MyxCMakeCheckPaths)

 link_directories(${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
-set(CMAKE_CXX_SOURCE_FILE_EXTENSIONS
-    ${CMAKE_CXX_SOURCE_FILE_EXTENSIONS};tpp;tcc)
+set(CMAKE_CXX_SOURCE_FILE_EXTENSIONS ${CMAKE_CXX_SOURCE_FILE_EXTENSIONS};tpp;tcc)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)

 include(MyxCMakeProjectVersion)
@ -15,6 +14,7 @@ include(MyxCMakeGlobalFunctions)
 include(MyxCMakeGlobalVariables)
 include(MyxCMakeDates)
 include(MyxCMakeLSBInfo)
+include(MyxCMakePaths)
 include(MyxCMakeCompiler)
 include(MyxCMakeCompilerFlags)
 include(MyxCMakeDistCC)
--- a/MyxCMake/modules/MyxCMakeCommonTargetProperties.cmake
+++ b/MyxCMake/modules/MyxCMakeCommonTargetProperties.cmake
@ -11,8 +11,7 @@ function(myx_cmake_common_target_properties target)
    #
    if(TARGET Qt5::Core)
      if(_target_type STREQUAL EXECUTABLE)
-        target_compile_options(${target}
-                               PUBLIC ${Qt5Core_EXECUTABLE_COMPILE_FLAGS})
+        target_compile_options(${target} PUBLIC ${Qt5Core_EXECUTABLE_COMPILE_FLAGS})
      endif()
      if(NOT MYX_CMAKE_DEBUG_OUTPUT)
        target_compile_definitions(${target} PUBLIC QT_NO_DEBUG_OUTPUT)
@ -51,8 +50,7 @@ function(myx_cmake_common_target_properties target)

  endif()

-  target_compile_features(${target} ${__visibility} cxx_alias_templates
-                                    cxx_nullptr cxx_override)
+  target_compile_features(${target} ${__visibility} cxx_alias_templates cxx_nullptr cxx_override)
  if(_target_type STREQUAL EXECUTABLE)
    set_target_properties(${target} PROPERTIES
      POSITION_INDEPENDENT_CODE ON
@ -71,13 +69,6 @@ function(myx_cmake_common_target_properties target)
    set_target_properties(${target} PROPERTIES POSITION_INDEPENDENT_CODE ON)
  endif()

-  if(_target_type MATCHES "_LIBRARY$" AND NOT ${target}-install-headers)
-    # Цель, используемая только для установки заголовочных файлов без компиляции проекта
-    add_custom_target(${target}-install-headers
-      COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=dev
-              -P "${CMAKE_BINARY_DIR}/cmake_install.cmake")
-  endif()
-
  # LTO only for executables (not libraries) in Release build type
  if(_target_type STREQUAL EXECUTABLE AND CMAKE_BUILD_TYPE STREQUAL Release)
    check_cxx_compiler_flag(-flto CXX_HAS_LTO_FLAG)
@ -120,6 +111,13 @@ function(myx_cmake_common_target_properties target)
  myx_cmake_analyze_pvs_studio(${target})
  myx_cmake_format_sources(${target})

+  if(_target_type MATCHES "_LIBRARY$" AND NOT ${target}-install-headers)
+    # Цель, используемая только для установки заголовочных файлов без компиляции проекта
+    add_custom_target(${target}-install-headers
+      COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=dev
+              -P "${CMAKE_BINARY_DIR}/cmake_install.cmake")
+  endif()
+
  # Создание в каталоге ${CMAKE_BINARY_DIR} стандартных каталогов bin,include,lib
  if(NOT TARGET ${target}-default-directories)
    add_custom_target(
--- a/MyxCMake/modules/MyxCMakeCompiler.cmake
+++ b/MyxCMake/modules/MyxCMakeCompiler.cmake
@ -1,8 +1,8 @@
 # C compiler name
 if(CMAKE_C_COMPILER_ID STREQUAL "Intel")
  set(CMAKE_C_COMPILER_IS_INTEL ON)
-elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_COMPILER_ID STREQUAL
-                                               "AppleClang")
+elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang" OR
+       CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
  set(CMAKE_C_COMPILER_IS_CLANG ON)
 elseif(CMAKE_C_COMPILER_ID STREQUAL "GNU")
  set(CMAKE_C_COMPILER_IS_GCC ON)
@ -13,8 +13,8 @@ endif()
 # C++ compiler name
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
  set(CMAKE_CXX_COMPILER_IS_INTEL ON)
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL
-                                                 "AppleClang")
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR
+       CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
  set(CMAKE_CXX_COMPILER_IS_CLANG ON)
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
  set(CMAKE_CXX_COMPILER_IS_GCC ON)
@ -25,13 +25,12 @@ endif()
 # Предпочтительные пути к утилитам для компоновки
 if(CMAKE_CXX_COMPILER_IS_GCC)
  # Astra Linux Smolensk 1.5
-  if(MYX_CMAKE_LSB_DISTRIBUTOR_ID STREQUAL "AstraLinuxSE"
-     AND MYX_CMAKE_LSB_CODENAME STREQUAL "smolensk"
-     AND MYX_CMAKE_LSB_RELEASE STREQUAL "1.5")
+  if(MYX_CMAKE_LSB_DISTRIBUTOR_ID STREQUAL "AstraLinuxSE" AND
+     MYX_CMAKE_LSB_CODENAME STREQUAL "smolensk" AND
+     MYX_CMAKE_LSB_RELEASE STREQUAL "1.5")
    find_program(CMAKE_GCC_AR NAMES "/usr/bin/x86_64-linux-gnu-gcc-ar-4.7")
    find_program(CMAKE_GCC_NM NAMES "/usr/bin/x86_64-linux-gnu-gcc-nm-4.7")
-    find_program(CMAKE_GCC_RANLIB
-                 NAMES "/usr/bin/x86_64-linux-gnu-gcc-ranlib-4.7")
+    find_program(CMAKE_GCC_RANLIB NAMES "/usr/bin/x86_64-linux-gnu-gcc-ranlib-4.7")
    # Elbrus E2K
  elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "e2k")
    find_program(CMAKE_GCC_AR
@ -47,18 +46,12 @@ if(CMAKE_CXX_COMPILER_IS_GCC)
  endif()

  if(CMAKE_GCC_AR)
-    set(CMAKE_AR
-        ${CMAKE_GCC_AR}
-        CACHE STRING "" FORCE)
+    set(CMAKE_AR ${CMAKE_GCC_AR} CACHE STRING "" FORCE)
  endif()
  if(CMAKE_GCC_NM)
-    set(CMAKE_NM
-        ${CMAKE_GCC_NM}
-        CACHE STRING "" FORCE)
+    set(CMAKE_NM ${CMAKE_GCC_NM} CACHE STRING "" FORCE)
  endif()
  if(CMAKE_GCC_RANLIB)
-    set(CMAKE_RANLIB
-        ${CMAKE_GCC_RANLIB}
-        CACHE STRING "" FORCE)
+    set(CMAKE_RANLIB ${CMAKE_GCC_RANLIB} CACHE STRING "" FORCE)
  endif()
 endif()
--- a/MyxCMake/modules/MyxCMakeDebugOutputOptions.cmake
+++ b/MyxCMake/modules/MyxCMakeDebugOutputOptions.cmake
@ -6,13 +6,7 @@ option(MYX_CMAKE_WARNING_OUTPUT "Enable warning output" OFF)
 # Если сборка производится в режиме для отладки, то включаются флаги для
 # разрешения отладочной печати
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
-  set(MYX_CMAKE_DEBUG_OUTPUT
-      ON
-      CACHE BOOL "" FORCE)
-  set(MYX_CMAKE_INFO_OUTPUT
-      ON
-      CACHE BOOL "" FORCE)
-  set(MYX_CMAKE_WARNING_OUTPUT
-      ON
-      CACHE BOOL "" FORCE)
+  set(MYX_CMAKE_DEBUG_OUTPUT   ON CACHE BOOL "" FORCE)
+  set(MYX_CMAKE_INFO_OUTPUT    ON CACHE BOOL "" FORCE)
+  set(MYX_CMAKE_WARNING_OUTPUT ON CACHE BOOL "" FORCE)
 endif()
--- a/MyxCMake/modules/MyxCMakeFormatSources.cmake
+++ b/MyxCMake/modules/MyxCMakeFormatSources.cmake
@ -37,15 +37,16 @@ endif()

 function(myx_cmake_format_sources target)

-  if(UNCRUSTIFY_EXE)
-    get_target_property(__sources ${target} SOURCES)
-    list(FILTER __sources EXCLUDE REGEX "qrc_.*\\.cpp$")
-    list(FILTER __sources EXCLUDE REGEX "moc_.*\\.cpp$")
-    list(FILTER __sources EXCLUDE REGEX "ui_.*\\.h$")
+  if(NOT TARGET myx-cmake-format-sources)
+    add_custom_target(myx-cmake-format-sources)
+  endif()

-    if(NOT TARGET myx-cmake-format-sources)
-      add_custom_target(myx-cmake-format-sources)
-    endif()
+  get_target_property(__sources ${target} SOURCES)
+  list(FILTER __sources EXCLUDE REGEX "qrc_.*\\.cpp$")
+  list(FILTER __sources EXCLUDE REGEX "moc_.*\\.cpp$")
+  list(FILTER __sources EXCLUDE REGEX "ui_.*\\.h$")
+
+  if(UNCRUSTIFY_EXE)
    if(NOT TARGET myx-cmake-format-sources-check)
      add_custom_target(myx-cmake-format-sources-check)
    endif()
--- a/MyxCMake/modules/MyxCMakeGlobalFunctions.cmake
+++ b/MyxCMake/modules/MyxCMakeGlobalFunctions.cmake
@ -2,9 +2,7 @@
 function(myx_cmake_canonical_string in_string out_string)
  string(TOUPPER ${in_string} _arg_uppercase)
  string(REGEX REPLACE "[ -]" "_" _arg_fixed ${_arg_uppercase})
-  set(${out_string}
-      ${_arg_fixed}
-      PARENT_SCOPE)
+  set(${out_string} ${_arg_fixed} PARENT_SCOPE)
 endfunction()

 # Добавление общего префикса ко всем переменным в списке
@ -13,7 +11,5 @@ function(myx_cmake_list_transform_prepend var prefix)
  foreach(filename ${${var}})
    list(APPEND temp "${prefix}${filename}")
  endforeach()
-  set(${var}
-      "${temp}"
-      PARENT_SCOPE)
+  set(${var} ${temp} PARENT_SCOPE)
 endfunction()
--- a/MyxCMake/modules/MyxCMakeGlobalVariables.cmake
+++ b/MyxCMake/modules/MyxCMakeGlobalVariables.cmake
@ -14,16 +14,12 @@ string(TOLOWER ${MYX_CMAKE_THEME_NAME_CANONICAL} MYX_CMAKE_THEME_NAME_LOWER)
 string(TOUPPER ${MYX_CMAKE_ORGANIZATION_NAME_CANONICAL} MYX_CMAKE_ORGANIZATION_NAME_UPPER)
 string(TOUPPER ${MYX_CMAKE_PROJECT_NAME_CANONICAL} MYX_CMAKE_PROJECT_NAME_UPPER)
 string(TOUPPER ${MYX_CMAKE_THEME_NAME_CANONICAL} MYX_CMAKE_THEME_NAME_UPPER)
-# cmake-format: on

 option(MYX_CMAKE_ADD_THEME_PREFIX "Append theme name to install prefix" OFF)
 if(MYX_CMAKE_ADD_THEME_PREFIX AND NOT MYX_CMAKE_THEME_PREFIX_APPENDED)
  if(NOT MYX_CMAKE_THEME_NAME_LOWER STREQUAL "default")
-    set(MYX_CMAKE_THEME_PREFIX_APPENDED
-        ON
-        CACHE BOOL "" FORCE)
-    set(CMAKE_INSTALL_PREFIX
-        "${CMAKE_INSTALL_PREFIX}/${MYX_CMAKE_THEME_NAME}"
-        CACHE PATH "" FORCE)
+    set(MYX_CMAKE_THEME_PREFIX_APPENDED ON CACHE BOOL "" FORCE)
+    set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/${MYX_CMAKE_THEME_NAME}" CACHE PATH "" FORCE)
  endif()
 endif()
+# cmake-format: on
--- a/MyxCMake/modules/MyxCMakeLSBInfo.cmake
+++ b/MyxCMake/modules/MyxCMakeLSBInfo.cmake
@ -24,6 +24,6 @@ else()
    execute_process(COMMAND ${_lsb_release_executable} -si OUTPUT_VARIABLE MYX_CMAKE_LSB_DISTRIBUTOR_ID OUTPUT_STRIP_TRAILING_WHITESPACE)
    execute_process(COMMAND ${_lsb_release_executable} -sc OUTPUT_VARIABLE MYX_CMAKE_LSB_CODENAME OUTPUT_STRIP_TRAILING_WHITESPACE)
    execute_process(COMMAND ${_lsb_release_executable} -sr OUTPUT_VARIABLE MYX_CMAKE_LSB_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE)
-  # cmake-format: on
  endif()
+  # cmake-format: on
 endif()
--- a/MyxCMake/modules/MyxCMakePaths.cmake
+++ b/MyxCMake/modules/MyxCMakePaths.cmake
@ -0,0 +1,9 @@
+if(MYX_CMAKE_LSB_DISTRIBUTOR_ID STREQUAL "AstraLinuxSE" OR
+    MYX_CMAKE_LSB_DISTRIBUTOR_ID STREQUAL "AstraLinuxCE")
+  set(CMAKE_37_MODULES_DIR "/usr/share/cmake-3.7/Modules")
+  if(IS_DIRECTORY ${CMAKE_37_MODULES_DIR})
+    if(NOT ${CMAKE_37_MODULES_DIR} IN_LIST CMAKE_MODULE_PATH)
+      list(APPEND CMAKE_MODULE_PATH ${CMAKE_37_MODULES_DIR})
+    endif()
+  endif()
+endif()
--- a/MyxCMake/modules/MyxCMakePrecompiledHeaders.cmake
+++ b/MyxCMake/modules/MyxCMakePrecompiledHeaders.cmake
@ -1,10 +1,10 @@
+# cmake-format: off
 if(${CMAKE_VERSION} VERSION_LESS "3.16.0")
  include(cotire OPTIONAL)
  if(COMMAND cotire)
-    option(MYX_CMAKE_PRECOMPILED_HEADERS "MyxCMake: enable precompiled headers"
-           OFF)
+    option(MYX_CMAKE_PRECOMPILED_HEADERS "MyxCMake: enable precompiled headers" OFF)
  endif()
 else()
-  option(MYX_CMAKE_PRECOMPILED_HEADERS "MyxCMake: enable precompiled headers"
-         OFF)
+  option(MYX_CMAKE_PRECOMPILED_HEADERS "MyxCMake: enable precompiled headers" OFF)
 endif()
+# cmake-format: on
--- a/MyxCMake/thirdparty/PVS-Studio.cmake
+++ b/MyxCMake/thirdparty/PVS-Studio.cmake
@ -3,7 +3,7 @@
 #
 # Version 12

-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.0.0)
 cmake_policy(SET CMP0054 NEW)

 if (PVS_STUDIO_AS_SCRIPT)
@ -31,7 +31,8 @@ if (PVS_STUDIO_AS_SCRIPT)
            endif ()
        endif ()
    endforeach ()
-
+    
+    file(REMOVE "${PVS_STUDIO_LOG_FILE}")
    execute_process(COMMAND ${PVS_STUDIO_COMMAND} ${additional_args}
                    RESULT_VARIABLE result
                    OUTPUT_VARIABLE output
@ -58,13 +59,17 @@ function (pvs_studio_log TEXT)
 endfunction ()

 function (pvs_studio_relative_path VAR ROOT FILEPATH)
+    if (WIN32)
+        STRING(REGEX REPLACE "\\\\" "/" ROOT ${ROOT})
+        STRING(REGEX REPLACE "\\\\" "/" FILEPATH ${FILEPATH})
+    endif()
    set("${VAR}" "${FILEPATH}" PARENT_SCOPE)
-    if ("${FILEPATH}" MATCHES "^/.*$" OR "${FILEPATH}" MATCHES "^.:/.*$")
+    if (IS_ABSOLUTE "${FILEPATH}")
        file(RELATIVE_PATH RPATH "${ROOT}" "${FILEPATH}")
-        if (NOT "${RPATH}" MATCHES "^\\.\\..*$")
+        if (NOT IS_ABSOLUTE "${RPATH}")
            set("${VAR}" "${RPATH}" PARENT_SCOPE)
-        endif ()
-    endif ()
+        endif()
+    endif()
 endfunction ()

 function (pvs_studio_join_path VAR DIR1 DIR2)
@ -96,7 +101,7 @@ macro (pvs_studio_append_flags_from_property CXX C DIR PREFIX)
 endmacro ()

 macro (pvs_studio_append_standard_flag FLAGS STANDARD)
-    if ("${STANDARD}" MATCHES "^(99|11|14|17)$")
+    if ("${STANDARD}" MATCHES "^(99|11|14|17|20)$")
        if ("${PVS_STUDIO_PREPROCESSOR}" MATCHES "gcc|clang")
            list(APPEND "${FLAGS}" "-std=c++${STANDARD}")
        endif ()
@ -205,8 +210,9 @@ function (pvs_studio_analyze_file SOURCE SOURCE_DIR BINARY_DIR)

        string(REPLACE ";" "$<SEMICOLON>" cmdline "${cmdline}")
        set(pvscmd "${CMAKE_COMMAND}"
-                   -D PVS_STUDIO_AS_SCRIPT=TRUE
+                   -D "PVS_STUDIO_AS_SCRIPT=TRUE"
                   -D "PVS_STUDIO_COMMAND=${cmdline}"
+                   -D "PVS_STUDIO_LOG_FILE=${LOG}"
                   -P "${PVS_STUDIO_SCRIPT}"
        )

@ -513,10 +519,14 @@ function (pvs_studio_add_target)
            if ("${PVS_STUDIO_FORMAT}" STREQUAL "")
                set(PVS_STUDIO_FORMAT "errorfile")
            endif ()
+            set(converter_no_help "")
+            if (PVS_STUDIO_HIDE_HELP)
+              set(converter_no_help "--noHelpMessages")
+            endif()
            list(APPEND COMMANDS
                COMMAND "${CMAKE_COMMAND}" -E remove -f "${PVS_STUDIO_LOG}.pvs.raw"
                COMMAND "${CMAKE_COMMAND}" -E rename "${PVS_STUDIO_LOG}" "${PVS_STUDIO_LOG}.pvs.raw"
-                COMMAND "${PVS_STUDIO_CONVERTER}" "${PVS_STUDIO_CONVERTER_ARGS}" -t "${PVS_STUDIO_FORMAT}" "${PVS_STUDIO_LOG}.pvs.raw" -o "${PVS_STUDIO_LOG}" -a "${PVS_STUDIO_MODE}"
+                COMMAND "${PVS_STUDIO_CONVERTER}" "${PVS_STUDIO_CONVERTER_ARGS}" ${converter_no_help} -t "${PVS_STUDIO_FORMAT}" "${PVS_STUDIO_LOG}.pvs.raw" -o "${PVS_STUDIO_LOG}" -a "${PVS_STUDIO_MODE}"
                )
            if(NOT PVS_STUDIO_KEEP_COMBINED_PLOG)
                list(APPEND COMMANDS COMMAND "${CMAKE_COMMAND}" -E remove -f "${PVS_STUDIO_LOG}.pvs.raw")
@ -544,9 +554,7 @@ function (pvs_studio_add_target)
    endif ()

    if (PVS_STUDIO_OUTPUT)
-        if (PVS_STUDIO_HIDE_HELP AND NOT WIN32)
-            set(COMMANDS COMMAND grep -v " error: Help:" ${PVS_STUDIO_LOG} 1>&2 || exit 0)
-        elseif (WIN32)
+        if (WIN32)
            set(COMMANDS COMMAND type "${PVS_STUDIO_LOG}" 1>&2)
        else ()
            set(COMMANDS COMMAND cat "${PVS_STUDIO_LOG}" 1>&2)
@ -555,9 +563,25 @@ function (pvs_studio_add_target)
        set(COMMANDS "")
    endif ()

+    set(props_file "${CMAKE_BINARY_DIR}/${PVS_STUDIO_TARGET}.user.props")
+    file(WRITE "${props_file}" [=[
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets">
+  <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ItemDefinitionGroup>
+  <CustomBuild>
+   <BuildInParallel>true</BuildInParallel>
+  </CustomBuild>
+ </ItemDefinitionGroup>
+</Project>
+]=])
+
    add_custom_target("${PVS_STUDIO_TARGET}" ${ALL} ${COMMANDS} 
                      WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" 
                      DEPENDS ${PVS_STUDIO_DEPENDS} "${PVS_STUDIO_LOG}")
+    set_target_properties("${PVS_STUDIO_TARGET}" PROPERTIES VS_USER_PROPS "${props_file}")

    # A workaround to add implicit dependencies of source files from include directories
    set_target_properties("${PVS_STUDIO_TARGET}" PROPERTIES INCLUDE_DIRECTORIES "${inc_path}")
--- a/build_deb.sh
+++ b/build_deb.sh
@ -3,16 +3,19 @@
 set -e

 V=$(grep -i "project.*VERSION.*LANGUAGES" CMakeLists.txt | sed 's/.*VERSION \([0-9.]*\) .*/\1/')
-D=$(mktemp -d "/tmp/myx-cmake.XXXXXX")
+D=build
+
 mkdir -p "$D/myx-cmake-$V"
 cp -ap CMakeLists.txt MyxCMake "$D/myx-cmake-$V"
 pushd "$D"
 tar Jcf "myx-cmake_${V}.orig.tar.xz" "myx-cmake-$V"
 popd
+
 cp -ap debian "$D/myx-cmake-$V"
 pushd "$D/myx-cmake-$V"
 dch -D unstable -v "${V}-1" -m "New version."
-debuild --no-sign
+dpkg-buildpackage -us -uc
 popd
-cp -f ${D}/myx*deb .
+
+rm -rf "$D/myx-cmake-$V"

--- a/debian/compat
+++ b/debian/compat
@ -0,0 +1 @@
+9
--- a/debian/control
+++ b/debian/control
@ -2,7 +2,7 @@ Source: myx-cmake
 Section: utils
 Priority: optional
 Maintainer: Andrey Astafyev <dev@246060.ru>
-Build-Depends: debhelper (>= 9), debhelper-compat (= 9), cmake
+Build-Depends: debhelper (>= 9), cmake
 Standards-Version: 4.2.0

 Package: myx-cmake
Author	SHA1	Message	Date
Andrey Astafyev	42b12b9f59	Версия 0.6.0	2022-04-08 15:50:39 +03:00
Andrey Astafyev	675363f678	CI 9	2022-04-08 15:08:56 +03:00
Andrey Astafyev	03e537d121	CI 8	2022-04-08 15:01:01 +03:00
Andrey Astafyev	8b388abe31	CI 7	2022-04-08 14:51:23 +03:00
Andrey Astafyev	8d133ac1f3	CI 6	2022-04-08 14:44:49 +03:00
Andrey Astafyev	a4df53b96a	CI 5	2022-04-08 13:38:56 +03:00
Andrey Astafyev	8fdb22820c	CI 4	2022-04-08 13:36:57 +03:00
Andrey Astafyev	cca00d195e	CI 3	2022-04-08 13:35:33 +03:00
Andrey Astafyev	70314325c7	CI 2	2022-04-08 13:33:29 +03:00
Andrey Astafyev	f8c9009e88	CI 1	2022-04-08 11:40:25 +03:00
Andrey Astafyev	9d00a9bfef	Проба сборки пакета	2022-04-08 11:24:36 +03:00
Andrey Astafyev	e1badf6f69	Версия 0.5.5	2022-04-08 08:13:47 +03:00
Andrey Astafyev	06f7013273	Обновление модуля PVS-Studio	2022-04-08 08:06:02 +03:00
Andrey Astafyev	366902c0a3	Версия 0.5.3	2022-04-07 14:17:40 +03:00
Andrey Astafyev	26e50c5a03	Функция myx_cmake_qt_autogen_target_properties	2022-04-07 12:27:02 +03:00
Andrey Astafyev	c0ee1985f8	Добавлен каталог для поиска модулей в ОС Астра	2022-01-26 09:58:24 +03:00
Andrey Astafyev	48c480af2e	Версия 0.5.0	2022-01-25 20:49:02 +03:00
Andrey Astafyev	f163819116	Версия 0.4.8	2022-01-25 13:21:05 +03:00
Andrey Astafyev	2a12f0250f	Версия 0.4.7	2022-01-11 19:14:50 +03:00
Andrey Astafyev	26e60bf5fd	Опечатка	2022-01-11 19:14:31 +03:00
Andrey Astafyev	3eb1e2c22e	Версия 0.4.6	2022-01-11 10:00:34 +03:00
Andrey Astafyev	ece04ba69b	Поддержка версий lcov до 1.14	2022-01-11 09:59:44 +03:00
Andrey Astafyev	7e50160742	Поддержка проверки покрытия кода в Clang	2022-01-11 09:56:00 +03:00