Compare commits

...

2 Commits

4 changed files with 23 additions and 27 deletions

View File

@ -1,9 +1,4 @@
find_program( find_program(CLANG_CHECK_EXE NAMES clang-check-10 clang-check-9 clang-check)
CLANG_CHECK_EXE
NAMES
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()

View File

@ -1,9 +1,4 @@
find_program( find_program(CLANG_TIDY_EXE NAMES clang-tidy-10 clang-tidy-9 clang-tidy)
CLANG_TIDY_EXE
NAMES
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()

View File

@ -1,8 +1,4 @@
find_program( find_program(CLANG_APPLY_REPLACEMENTS_EXE NAMES clang-apply-replacements-10 clang-apply-replacements-9
CLANG_APPLY_REPLACEMENTS_EXE
NAMES
clang-apply-replacements-10
clang-apply-replacements-9
clang-apply-replacements) clang-apply-replacements)
find_program(CLAZY_EXE NAMES clazy-standalone) find_program(CLAZY_EXE NAMES clazy-standalone)
@ -20,16 +16,21 @@ function(add_clazy_check target)
set(_sources ${_CLAZY_UNPARSED_ARGUMENTS}) set(_sources ${_CLAZY_UNPARSED_ARGUMENTS})
if(NOT _CLAZY_CHECKS) if(NOT _CLAZY_CHECKS)
set(_CLAZY_CHECKS "level2,container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,isempty-vs-count,qt-keywords,unneeded-cast") set(_CLAZY_CHECKS
"level2,container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,isempty-vs-count,qt-keywords,unneeded-cast"
)
endif() endif()
set(_args -checks=${_CLAZY_CHECKS} -extra-arg="-Wno-unknown-warning-option" -export-fixes=clazy-fixes-file.yaml) set(_args -checks=${_CLAZY_CHECKS} -extra-arg="-Wno-unknown-warning-option"
-export-fixes=clazy-fixes-file.yaml)
if(CLAZY_EXE) if(CLAZY_EXE)
if(NOT TARGET clazy-check) if(NOT TARGET clazy-check)
add_custom_target(clazy-check) add_custom_target(clazy-check)
endif() endif()
if(CMLIB_CLAZY_FIX) if(CMLIB_CLAZY_FIX)
add_custom_target(clazy-check-${target} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} add_custom_target(
clazy-check-${target}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMAND ${CLAZY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${_sources} COMMAND ${CLAZY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${_sources}
COMMAND ${CLANG_APPLY_REPLACEMENTS_EXE} ${CMAKE_BINARY_DIR}) COMMAND ${CLANG_APPLY_REPLACEMENTS_EXE} ${CMAKE_BINARY_DIR})
else() else()

View File

@ -18,9 +18,13 @@ function(common_target_properties target)
target_compile_features(${target} ${__visibility} ${COMMON_CXX_FEATURES}) target_compile_features(${target} ${__visibility} ${COMMON_CXX_FEATURES})
get_target_property(_targetType ${target} TYPE) get_target_property(_targetType ${target} TYPE)
if(_targetType STREQUAL "EXECUTABLE" AND CMAKE_CXX_COMPILE_OPTIONS_PIE) if(_targetType STREQUAL "EXECUTABLE")
set_target_properties(${target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY
${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
if(CMAKE_CXX_COMPILE_OPTIONS_PIE)
target_compile_options(${target} PUBLIC "${CMAKE_CXX_COMPILE_OPTIONS_PIE}") target_compile_options(${target} PUBLIC "${CMAKE_CXX_COMPILE_OPTIONS_PIE}")
endif() endif()
endif()
target_include_directories( target_include_directories(
${target} ${target}
PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
@ -69,7 +73,8 @@ function(common_target_properties target)
endif() endif()
endif() endif()
set_target_properties(${target} PROPERTIES COTIRE_ENABLE_PRECOMPILED_HEADER ${CMLIB_COTIRE_ENABLE_PRECOMPILED_HEADER}) set_target_properties(${target} PROPERTIES COTIRE_ENABLE_PRECOMPILED_HEADER
${CMLIB_COTIRE_ENABLE_PRECOMPILED_HEADER})
set_target_properties(${target} PROPERTIES COTIRE_ADD_UNITY_BUILD ${CMLIB_COTIRE_ADD_UNITY_BUILD}) set_target_properties(${target} PROPERTIES COTIRE_ADD_UNITY_BUILD ${CMLIB_COTIRE_ADD_UNITY_BUILD})
if(CMAKE_BUILD_TYPE STREQUAL Profile) if(CMAKE_BUILD_TYPE STREQUAL Profile)