f1x1t/cmlib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git.246060.ru:f1x1t/cmlib

Browse Source
This commit is contained in:
Andrei Astafev 2020-12-10 12:24:32 +03:00
commit 81bed8b385
5 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMLibCodeAnalysisClangAnalyze.cmake
View File

@ -1,4 +1,12 @@
find_program(CLANG_CHECK_EXE NAMES clang-check-10 clang-check-9 clang-check) find_program(
CLANG_CHECK_EXE
NAMES
clang-check-13
clang-check-12
clang-check-11
clang-check-10
clang-check-9
clang-check)
if(CLANG_CHECK_EXE) if(CLANG_CHECK_EXE)
option(CMLIB_CLANG_ANALYZE_FIX "Perform fixes for Clang-Check" OFF) option(CMLIB_CLANG_ANALYZE_FIX "Perform fixes for Clang-Check" OFF)
endif() endif()

10
CMLibCodeAnalysisClangTidy.cmake
View File

@ -1,4 +1,12 @@
find_program(CLANG_TIDY_EXE NAMES clang-tidy-10 clang-tidy-9 clang-tidy) find_program(
CLANG_TIDY_EXE
NAMES
clang-tidy-13
clang-tidy-12
clang-tidy-11
clang-tidy-10
clang-tidy-9
clang-tidy)
if(CLANG_TIDY_EXE) if(CLANG_TIDY_EXE)
option(CMLIB_CLANG_TIDY_FIX "Perform fixes for Clang-Tidy" OFF) option(CMLIB_CLANG_TIDY_FIX "Perform fixes for Clang-Tidy" OFF)
endif() endif()

11
CMLibCodeAnalysisClazy.cmake
View File

@ -1,5 +1,12 @@
find_program(CLANG_APPLY_REPLACEMENTS_EXE NAMES clang-apply-replacements-10 clang-apply-replacements-9 find_program(
clang-apply-replacements) CLANG_APPLY_REPLACEMENTS_EXE
NAMES
clang-apply-replacements-13
clang-apply-replacements-12
clang-apply-replacements-11
clang-apply-replacements-10
clang-apply-replacements-9
clang-apply-replacements)
find_program(CLAZY_EXE NAMES clazy-standalone) find_program(CLAZY_EXE NAMES clazy-standalone)

8
CMLibCodeAnalysisPvsStudio.cmake
View File

@ -17,15 +17,17 @@ function(add_pvs_check target)
add_dependencies(pvs-check pvs-check-${target}) add_dependencies(pvs-check pvs-check-${target})
configure_file("${CMLIB_MODULE_DIR}/hpp/pvs_studio.hpp.in" "${CMAKE_BINARY_DIR}/include/pvs_studio.hpp") configure_file("${CMLIB_MODULE_DIR}/hpp/pvs_studio.hpp.in" "${CMAKE_BINARY_DIR}/include/pvs_studio.hpp")
get_target_property(target_type ${target} TYPE) get_target_property(target_type ${target} TYPE)
if (${target_type} STREQUAL "INTERFACE_LIBRARY") if(${target_type} STREQUAL "INTERFACE_LIBRARY")
set(target_type INTERFACE) set(target_type INTERFACE)
else() else()
set(target_type PRIVATE) set(target_type PRIVATE)
endif() endif()
if(MSVC) if(MSVC)
target_compile_options(${target} BEFORE ${target_type} /FI "${CMAKE_BINARY_DIR}/include/pvs_studio.hpp") target_compile_options(${target} BEFORE ${target_type} /FI
"${CMAKE_BINARY_DIR}/include/pvs_studio.hpp")
else() # GCC/Clang else() # GCC/Clang
target_compile_options(${target} BEFORE ${target_type} -include "${CMAKE_BINARY_DIR}/include/pvs_studio.hpp") target_compile_options(${target} BEFORE ${target_type} -include
"${CMAKE_BINARY_DIR}/include/pvs_studio.hpp")
endif() endif()
else() else()
message(STATUS "CMLIB warning:") message(STATUS "CMLIB warning:")

5
thirdparty/cotire.cmake vendored
View File

@ -1136,6 +1136,11 @@ function (cotire_parse_includes _language _scanOutput _ignoredIncludeDirs _honor
string (REPLACE ";" "\\;" _scanOutput "${_scanOutput}") string (REPLACE ";" "\\;" _scanOutput "${_scanOutput}")
# then separate lines # then separate lines
string (REGEX REPLACE "\n" ";" _scanOutput "${_scanOutput}") string (REGEX REPLACE "\n" ";" _scanOutput "${_scanOutput}")
if ("${_language}" STREQUAL "CXX")
# Fix clang9's libc++ errno
message (STATUS "replacing <stdlib.h> with <cstdlib>")
string (REGEX REPLACE "include_next" "include" _scanOutput "${_scanOutput}")
endif()
list (LENGTH _scanOutput _len) list (LENGTH _scanOutput _len)
# remove duplicate lines to speed up parsing # remove duplicate lines to speed up parsing
list (REMOVE_DUPLICATES _scanOutput) list (REMOVE_DUPLICATES _scanOutput)