Compare commits
6 Commits
54f8cfc1cc
...
2.4.34
Author | SHA1 | Date | |
---|---|---|---|
3b9e0373b5 | |||
358a03401b | |||
7eedd8b932 | |||
764b541bfa | |||
f1b574cd50 | |||
b3d19b7336 |
1
Makefile
1
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)
|
||||
|
@@ -21,6 +21,7 @@ endif()
|
||||
find_package(Sanitizers REQUIRED)
|
||||
|
||||
include(${MYXX_CMAKE_LIB_DIR}/WarningFlags.cmake)
|
||||
include(${MYXX_CMAKE_LIB_DIR}/SyntaxCheck.cmake)
|
||||
include(${MYXX_CMAKE_LIB_DIR}/Coverage.cmake)
|
||||
include(${MYXX_CMAKE_LIB_DIR}/AnalyzeApplyReplacements.cmake)
|
||||
include(${MYXX_CMAKE_LIB_DIR}/AnalyzeClangTidy.cmake)
|
||||
@@ -38,23 +39,36 @@ function(myxx)
|
||||
return()
|
||||
endif()
|
||||
|
||||
get_property(targets DIRECTORY ${CMAKE_BINARY_DIR} PROPERTY BUILDSYSTEM_TARGETS)
|
||||
foreach(iter ${targets})
|
||||
get_target_property(target_type ${iter} TYPE)
|
||||
if((NOT ${target_type} STREQUAL "UTILITY") AND
|
||||
(NOT ${iter} MATCHES ".*_shared$" ) AND
|
||||
(NOT ${iter} MATCHES ".*_static$" )
|
||||
)
|
||||
myxx_code_coverage(${iter})
|
||||
myxx_analyze_clang_tidy(${iter})
|
||||
myxx_analyze_clang_check(${iter})
|
||||
if(MYXX_CMAKE_CLAZY_FIX)
|
||||
myxx_analyze_clazy(${iter} FIX)
|
||||
else()
|
||||
myxx_analyze_clazy(${iter})
|
||||
if(NOT ${PROJECT_BINARY_DIR} STREQUAL ${CMAKE_BINARY_DIR})
|
||||
return()
|
||||
endif()
|
||||
myxx_analyze_pvs_studio(${iter})
|
||||
myxx_add_sanitizers(${iter})
|
||||
|
||||
get_property(__targets DIRECTORY ${CMAKE_BINARY_DIR} PROPERTY BUILDSYSTEM_TARGETS)
|
||||
foreach(__iter ${__targets})
|
||||
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_code_coverage(${__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()
|
||||
myxx_analyze_clazy(${__iter})
|
||||
endif()
|
||||
myxx_analyze_pvs_studio(${__iter})
|
||||
myxx_add_sanitizers(${__iter})
|
||||
endif()
|
||||
endforeach()
|
||||
endfunction(myxx)
|
||||
|
@@ -1,4 +1,4 @@
|
||||
set(MYXX_CMAKE_PACKAGE_VERSION "2.0.9")
|
||||
set(MYXX_CMAKE_PACKAGE_VERSION "2.4.32")
|
||||
if(MYXX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
|
||||
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
||||
else()
|
||||
|
@@ -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)
|
||||
|
@@ -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)
|
||||
@@ -14,7 +14,9 @@ find_program(CLANG_CHECK_EXE NAMES ${CLANG_CHECK_NAMES})
|
||||
unset(CLANG_CHECK_NAMES)
|
||||
|
||||
function(myxx_analyze_clang_check TARGET_NAME)
|
||||
myx_skip_external_target(${TARGET_NAME})
|
||||
if(NOT ${PROJECT_BINARY_DIR} STREQUAL ${CMAKE_BINARY_DIR})
|
||||
return()
|
||||
endif()
|
||||
|
||||
if(NOT CLANG_CHECK_EXE)
|
||||
message(STATUS "MyxCMake: Clang Check analyzer is not found")
|
||||
|
@@ -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)
|
||||
@@ -14,7 +14,9 @@ find_program(CLANG_TIDY_EXE NAMES ${CLANG_TIDY_NAMES})
|
||||
unset(CLANG_TIDY_NAMES)
|
||||
|
||||
function(myxx_analyze_clang_tidy TARGET_NAME)
|
||||
myx_skip_external_target(${TARGET_NAME})
|
||||
if(NOT ${PROJECT_BINARY_DIR} STREQUAL ${CMAKE_BINARY_DIR})
|
||||
return()
|
||||
endif()
|
||||
|
||||
if(NOT CLANG_TIDY_EXE)
|
||||
message(STATUS "MyxxCMake: Clang Tidy analyzer is not found")
|
||||
@@ -52,3 +54,54 @@ function(myxx_analyze_clang_tidy TARGET_NAME)
|
||||
add_dependencies(${TARGET_NAME}-analyze-clang-tidy ${TARGET_NAME})
|
||||
add_dependencies(myxx-analyze-clang-tidy ${TARGET_NAME}-analyze-clang-tidy)
|
||||
endfunction()
|
||||
|
||||
|
||||
function(myxx_analyze_clang_tidy_naming TARGET_NAME)
|
||||
if(NOT ${PROJECT_BINARY_DIR} STREQUAL ${CMAKE_BINARY_DIR})
|
||||
return()
|
||||
endif()
|
||||
|
||||
if(NOT CLANG_TIDY_EXE)
|
||||
message(STATUS "MyxxCMake: Clang Tidy analyzer is not found")
|
||||
return()
|
||||
endif()
|
||||
|
||||
set(options FIX)
|
||||
set(oneValueArgs CONFIG)
|
||||
set(multiValueArgs EXTRA_ARGS)
|
||||
cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
|
||||
|
||||
if(NOT ARG_CONFIG)
|
||||
set(ARG_CONFIG ${PROJECT_SOURCE_DIR}/.clang-tidy-naming)
|
||||
endif()
|
||||
|
||||
if(NOT EXISTS ${ARG_CONFIG})
|
||||
return()
|
||||
endif()
|
||||
|
||||
if(TARGET ${TARGET_NAME}-analyze-clang-tidy-naming)
|
||||
message(STATUS "MyxxCMake: target ${TARGET_NAME}-analyze-clang-tidy-naming already exists")
|
||||
return()
|
||||
endif()
|
||||
|
||||
set(__cmd_args -extra-arg="-Wno-unknown-warning-option ${ARG_EXTRA_ARGS}")
|
||||
get_target_property(__sources ${TARGET_NAME} SOURCES)
|
||||
foreach(__iter ${__sources})
|
||||
string(FIND ${__iter} ${CMAKE_BINARY_DIR} __pos)
|
||||
if(__pos EQUAL -1)
|
||||
list(APPEND __filtered_sources ${__iter})
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
if(ARG_FIX)
|
||||
list(APPEND __cmd_args "-fix-errors")
|
||||
endif()
|
||||
if(NOT TARGET myxx-analyze-clang-tidy-naming)
|
||||
add_custom_target(myxx-analyze-clang-tidy-naming)
|
||||
endif()
|
||||
add_custom_target(${TARGET_NAME}-analyze-clang-tidy-naming
|
||||
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
|
||||
COMMAND ${CLANG_TIDY_EXE} ${__cmd_args} -p ${CMAKE_BINARY_DIR} ${__filtered_sources})
|
||||
add_dependencies(${TARGET_NAME}-analyze-clang-tidy-naming ${TARGET_NAME})
|
||||
add_dependencies(myxx-analyze-clang-tidy-naming ${TARGET_NAME}-analyze-clang-tidy-naming)
|
||||
endfunction()
|
||||
|
@@ -7,7 +7,9 @@ if(CLAZY_EXE AND CLANG_APPLY_REPLACEMENTS_EXE)
|
||||
endif()
|
||||
|
||||
function(myxx_analyze_clazy TARGET_NAME)
|
||||
myx_skip_external_target(${TARGET_NAME})
|
||||
if(NOT ${PROJECT_BINARY_DIR} STREQUAL ${CMAKE_BINARY_DIR})
|
||||
return()
|
||||
endif()
|
||||
|
||||
if(NOT CLAZY_EXE)
|
||||
message(STATUS "MyxCMake: Clazy standalone analyzer is not found")
|
||||
@@ -36,10 +38,10 @@ function(myxx_analyze_clazy TARGET_NAME)
|
||||
-extra-arg=-Wno-unknown-warning-option
|
||||
-export-fixes=clazy-fixes-file.yaml)
|
||||
get_target_property(__sources ${TARGET_NAME} SOURCES)
|
||||
foreach(iter ${__sources})
|
||||
string(FIND ${iter} ${CMAKE_BINARY_DIR} pos)
|
||||
if(pos EQUAL -1)
|
||||
list(APPEND __filtered_sources ${iter})
|
||||
foreach(__iter ${__sources})
|
||||
string(FIND ${__iter} ${CMAKE_BINARY_DIR} __pos)
|
||||
if(__pos EQUAL -1)
|
||||
list(APPEND __filtered_sources ${__iter})
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
|
@@ -10,7 +10,9 @@ function(myxx_analyze_pvs_studio TARGET_NAME)
|
||||
set(CMAKE_CURRENT_FUNCTION_LIST_DIR ${MYXX_CMAKE_LIB_PVS_DIR_BACKPORT})
|
||||
endif()
|
||||
|
||||
myx_skip_external_target(${TARGET_NAME})
|
||||
if(NOT ${PROJECT_BINARY_DIR} STREQUAL ${CMAKE_BINARY_DIR})
|
||||
return()
|
||||
endif()
|
||||
|
||||
if(NOT PVS_STUDIO_ANALYZER_EXE)
|
||||
message(STATUS "MyxxCMake: pvs-studio-analyzer not found.")
|
||||
@@ -37,11 +39,11 @@ 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(sources ${TARGET_NAME} SOURCES)
|
||||
foreach(iter ${sources})
|
||||
string(FIND ${iter} ${CMAKE_BINARY_DIR} pos)
|
||||
if(pos EQUAL -1)
|
||||
list(APPEND srcs ${iter})
|
||||
get_target_property(__target_sources ${TARGET_NAME} SOURCES)
|
||||
foreach(__iter ${__target_sources})
|
||||
string(FIND ${__iter} ${CMAKE_BINARY_DIR} __pos)
|
||||
if(__pos EQUAL -1)
|
||||
list(APPEND __filtered_sources ${__iter})
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
|
@@ -9,7 +9,10 @@ function(myxx_code_coverage TARGET_NAME)
|
||||
if(NOT MYXX_CODE_COVERAGE)
|
||||
return()
|
||||
endif()
|
||||
myx_skip_external_target(${TARGET_NAME})
|
||||
|
||||
if(NOT ${PROJECT_BINARY_DIR} STREQUAL ${CMAKE_BINARY_DIR})
|
||||
return()
|
||||
endif()
|
||||
|
||||
set(options)
|
||||
set(oneValueArgs)
|
||||
|
18
MyxxCMake/lib/SyntaxCheck.cmake
Normal file
18
MyxxCMake/lib/SyntaxCheck.cmake
Normal file
@@ -0,0 +1,18 @@
|
||||
include_guard(GLOBAL)
|
||||
|
||||
option(MYXX_CMAKE_SYNTAX_CHECK_ONLY "only check syntax (-fsyntax-only)" OFF)
|
||||
if(MYXX_CMAKE_SYNTAX_CHECK_ONLY)
|
||||
if (NOT ((CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR
|
||||
(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")))
|
||||
myx_message_warning("only clang and gcc support -fsyntax-only, using ${CMAKE_CXX_COMPILER_ID}")
|
||||
else()
|
||||
add_compile_options(-fsyntax-only)
|
||||
set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} && touch <OBJECT>")
|
||||
set(CMAKE_CXX_CREATE_SHARED_LIBRARY "touch <TARGET>")
|
||||
set(CMAKE_CXX_CREATE_SHARED_MODULE "touch <TARGET>")
|
||||
set(CMAKE_CXX_LINK_EXECUTABLE "touch <TARGET>")
|
||||
set(CMAKE_CXX_ARCHIVE_CREATE "touch <TARGET>")
|
||||
set(CMAKE_CXX_ARCHIVE_APPEND "touch <TARGET>")
|
||||
set(CMAKE_CXX_ARCHIVE_FINISH "touch <TARGET>")
|
||||
endif()
|
||||
endif()
|
@@ -3,8 +3,7 @@
|
||||
# 2020-2022 (c) PVS-Studio LLC
|
||||
# Version 12
|
||||
|
||||
cmake_minimum_required(VERSION 3.0.0)
|
||||
cmake_policy(SET CMP0051 NEW)
|
||||
cmake_minimum_required(VERSION 3.6)
|
||||
cmake_policy(SET CMP0054 NEW)
|
||||
|
||||
if (PVS_STUDIO_AS_SCRIPT)
|
||||
@@ -60,7 +59,7 @@ function (pvs_studio_log TEXT)
|
||||
endfunction()
|
||||
|
||||
function (pvs_studio_relative_path VAR ROOT FILEPATH)
|
||||
if (WIN32)
|
||||
if (CMAKE_HOST_WIN32)
|
||||
STRING(REGEX REPLACE "\\\\" "/" ROOT ${ROOT})
|
||||
STRING(REGEX REPLACE "\\\\" "/" FILEPATH ${FILEPATH})
|
||||
endif()
|
||||
@@ -105,6 +104,8 @@ macro (pvs_studio_append_standard_flag FLAGS STANDARD)
|
||||
if ("${STANDARD}" MATCHES "^(99|11|14|17|20)$")
|
||||
if ("${PVS_STUDIO_PREPROCESSOR}" MATCHES "gcc|clang")
|
||||
list(APPEND "${FLAGS}" "-std=c++${STANDARD}")
|
||||
elseif("${PVS_STUDIO_PREPROCESSOR}" MATCHES "visualcpp")
|
||||
list(APPEND "${FLAGS}" "/std:c++${STANDARD}")
|
||||
endif()
|
||||
endif()
|
||||
endmacro()
|
||||
@@ -184,7 +185,7 @@ function (pvs_studio_analyze_file SOURCE SOURCE_DIR BINARY_DIR)
|
||||
pvs_studio_relative_path(SOURCE_RELATIVE "${SOURCE_DIR}" "${SOURCE}")
|
||||
pvs_studio_join_path(SOURCE "${SOURCE_DIR}" "${SOURCE}")
|
||||
|
||||
set(LOG "${BINARY_DIR}/PVS-Studio/${SOURCE_RELATIVE}.plog")
|
||||
set(LOG "${BINARY_DIR}/PVS-Studio/${TARGET}/${SOURCE_RELATIVE}.log")
|
||||
get_filename_component(LOG "${LOG}" REALPATH)
|
||||
get_filename_component(PARENT_DIR "${LOG}" DIRECTORY)
|
||||
|
||||
@@ -343,7 +344,7 @@ function (pvs_studio_add_target)
|
||||
|
||||
set(PATHS)
|
||||
|
||||
if (WIN32)
|
||||
if (CMAKE_HOST_WIN32)
|
||||
# The registry value is only read when you do some cache operation on it.
|
||||
# https://stackoverflow.com/questions/1762201/reading-registry-values-with-cmake
|
||||
GET_FILENAME_COMPONENT(ROOT "[HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node\\ProgramVerificationSystems\\PVS-Studio;installDir]" ABSOLUTE CACHE)
|
||||
@@ -521,11 +522,31 @@ function (pvs_studio_add_target)
|
||||
|
||||
pvs_studio_relative_path(LOG_RELATIVE "${CMAKE_BINARY_DIR}" "${PVS_STUDIO_LOG}")
|
||||
if (PVS_STUDIO_PLOGS OR PVS_STUDIO_COMPILE_COMMANDS)
|
||||
if (WIN32)
|
||||
if (CMAKE_HOST_WIN32)
|
||||
string(REPLACE / \\ PVS_STUDIO_PLOGS "${PVS_STUDIO_PLOGS}")
|
||||
endif()
|
||||
if (WIN32)
|
||||
if (CMAKE_GENERATOR MATCHES "NMake")
|
||||
set(COMMAND_TYPE_FILE "${CMAKE_BINARY_DIR}/PVSConcatAllLogs.cmd")
|
||||
|
||||
# The number of files that will be merged in one call to the type command
|
||||
set(STEP_SIZE 30)
|
||||
set(BEGIN 0)
|
||||
|
||||
list(APPEND PVS_STUDIO_PLOGS ${PVS_STUDIO_PLOGS_LOGS})
|
||||
list(LENGTH PVS_STUDIO_PLOGS END)
|
||||
|
||||
# Creating a bat file to call the 'type' command
|
||||
file(WRITE ${COMMAND_TYPE_FILE} "@echo off\nbreak > ${PVS_STUDIO_LOG}\n")
|
||||
|
||||
while(BEGIN LESS END)
|
||||
list(SUBLIST PVS_STUDIO_PLOGS ${BEGIN} ${STEP_SIZE} NEW_LIST)
|
||||
file(APPEND ${COMMAND_TYPE_FILE} "type ${NEW_LIST} >> ${PVS_STUDIO_LOG} 2>nul || cd .\n")
|
||||
math(EXPR BEGIN "${BEGIN} + ${STEP_SIZE}")
|
||||
endwhile()
|
||||
|
||||
list(APPEND COMMANDS COMMAND call ${COMMAND_TYPE_FILE})
|
||||
else()
|
||||
set(COMMANDS COMMAND type ${PVS_STUDIO_PLOGS} ${PVS_STUDIO_PLOGS_LOGS} > "${PVS_STUDIO_LOG}" 2>nul || cd .)
|
||||
endif()
|
||||
else()
|
||||
set(COMMANDS COMMAND cat ${PVS_STUDIO_PLOGS} ${PVS_STUDIO_PLOGS_LOGS} > "${PVS_STUDIO_LOG}" 2>/dev/null || true)
|
||||
endif()
|
||||
@@ -553,7 +574,7 @@ function (pvs_studio_add_target)
|
||||
set(COMMENT "Generating ${LOG_RELATIVE}: no sources found")
|
||||
endif()
|
||||
|
||||
if (WIN32)
|
||||
if (CMAKE_HOST_WIN32)
|
||||
string(REPLACE / \\ PVS_STUDIO_LOG "${PVS_STUDIO_LOG}")
|
||||
endif()
|
||||
|
||||
|
@@ -50,6 +50,10 @@ function(sanitizer_add_blacklist_file FILE)
|
||||
endfunction()
|
||||
|
||||
function(myxx_add_sanitizers ...)
|
||||
if(NOT ${PROJECT_BINARY_DIR} STREQUAL ${CMAKE_BINARY_DIR})
|
||||
return()
|
||||
endif()
|
||||
|
||||
# If no sanitizer is enabled, return immediately.
|
||||
if(NOT
|
||||
(SANITIZE_ADDRESS
|
||||
|
@@ -2,9 +2,9 @@
|
||||
|
||||
## Установка
|
||||
|
||||
Скачать [пакет](../../../releases/download/2.0.9/myxx-cmake_2.0.9_all.deb)
|
||||
для Debian и установить его, выполнив команду `sudo dpkg -i myxx-cmake_2.0.9_all.deb`,
|
||||
или [архив](../../../releases/download/2.0.9/myxx-cmake-local-2.0.9.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`.
|
||||
|
||||
## Использование
|
||||
|
2
debian/CMakeLists.txt
vendored
2
debian/CMakeLists.txt
vendored
@@ -1,5 +1,5 @@
|
||||
cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
|
||||
project(myxx-cmake VERSION 2.0.9 LANGUAGES)
|
||||
project(myxx-cmake VERSION 2.4.32 LANGUAGES)
|
||||
|
||||
include(GNUInstallDirs)
|
||||
file(WRITE ${CMAKE_SOURCE_DIR}/MyxxCMake/MyxxCMakeConfigVersion.cmake
|
||||
|
2
debian/changelog
vendored
2
debian/changelog
vendored
@@ -1,4 +1,4 @@
|
||||
myxx-cmake (2.0.9) unstable; urgency=medium
|
||||
myxx-cmake (2.4.32) unstable; urgency=medium
|
||||
|
||||
* New version.
|
||||
|
||||
|
Reference in New Issue
Block a user