CMLibCodeAnalysisClangAnalyze.cmake

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

CMLibCodeAnalysisClangTidy.cmake

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

CMLibCodeAnalysisClazy.cmake

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

CMLibCommonTargetProperties.cmake

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