Версия 0.6.0

.gitignore

@@ -1,3 +1,4 @@
+build
 *.deb
 MyxCMake/MyxCMakeConfigVersion.cmake
 

.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

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.0)
-project(myx-cmake VERSION 0.5.1 LANGUAGES)
+project(myx-cmake VERSION 0.6.0 LANGUAGES)
 
 include(GNUInstallDirs)
 file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake

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}
+        target_compile_options(${target} PUBLIC ${Qt5Core_EXECUTABLE_COMPILE_FLAGS})
-                               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
+  target_compile_features(${target} ${__visibility} cxx_alias_templates cxx_nullptr cxx_override)
-                                    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(

MyxCMake/modules/MyxCMakeFormatSources.cmake

@@ -41,12 +41,12 @@ function(myx_cmake_format_sources target)
     add_custom_target(myx-cmake-format-sources)
   endif()
 
-  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(UNCRUSTIFY_EXE)
     if(NOT TARGET myx-cmake-format-sources-check)
       add_custom_target(myx-cmake-format-sources-check)
     endif()

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)
@@ -32,6 +32,7 @@ if (PVS_STUDIO_AS_SCRIPT)
         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)
+        if (WIN32)
-            set(COMMANDS COMMAND grep -v " error: Help:" ${PVS_STUDIO_LOG} 1>&2 || exit 0)
-        elseif (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}")

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"