diff --git a/CMLibBuildTypes.cmake b/CMLibBuildTypes.cmake index 3194574..ed5b3e2 100644 --- a/CMLibBuildTypes.cmake +++ b/CMLibBuildTypes.cmake @@ -24,8 +24,10 @@ endif() if(CMAKE_BUILD_TYPE STREQUAL Profile) # Ключи компиляции для режима профилирования в зависимости от типа компилятора if(CMAKE_CXX_COMPILER_IS_Clang OR CMAKE_CXX_COMPILER_IS_GCC) - set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE} -ggdb -pg -fno-omit-frame-pointer" CACHE STRING "" FORCE) - set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE} -ggdb -pg -fno-omit-frame-pointer" CACHE STRING "" FORCE) + set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE} -ggdb -pg -fno-omit-frame-pointer" CACHE STRING "" + FORCE) + set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE} -ggdb -pg -fno-omit-frame-pointer" CACHE STRING + "" FORCE) set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -pg" CACHE STRING "" FORCE) set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -pg" CACHE STRING "" FORCE) set(CMAKE_STATIC_LINKER_FLAGS_PROFILE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} -pg" CACHE STRING "" FORCE) diff --git a/CMLibCPack.cmake b/CMLibCPack.cmake index 5862b35..4ebc2b6 100644 --- a/CMLibCPack.cmake +++ b/CMLibCPack.cmake @@ -40,17 +40,16 @@ if(CMLIB_COMPACT_SOURCE_PACKAGE) # Список масок для исключения из архива исходных текстов для более компактного архива set(CPACK_SOURCE_IGNORE_FILES "${CPACK_SOURCE_IGNORE_FILES}" - "/\\\\.git/" - "/\\\\.gitlab-ci/" - "\\\\.clang-tidy$" - "\\\\.cmake-format$" - "\\\\.gitignore$" - "\\\\.gitattributes$" - "\\\\.gitmodules$" - "\\\\.gitlab-ci.yml$") + "/\\\\.git/" + "/\\\\.gitlab-ci/" + "\\\\.clang-tidy$" + "\\\\.cmake-format$" + "\\\\.gitignore$" + "\\\\.gitattributes$" + "\\\\.gitmodules$" + "\\\\.gitlab-ci.yml$") endif() - set(CPACK_PROJECT_CONFIG_FILE ${CMAKE_CURRENT_LIST_DIR}/CMLibCPackProject.cmake) # Правила для сборки пакетов для Debian diff --git a/CMLibCodeAnalysisClangAnalyze.cmake b/CMLibCodeAnalysisClangAnalyze.cmake index 5b20aad..daee4af 100644 --- a/CMLibCodeAnalysisClangAnalyze.cmake +++ b/CMLibCodeAnalysisClangAnalyze.cmake @@ -22,9 +22,8 @@ function(add_clang_analyze_check target) if(NOT TARGET clang-analyze-check) add_custom_target(clang-analyze-check) endif() - add_custom_target( - clang-analyze-check-${target} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMMAND ${CLANG_CHECK_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${_sources}) + add_custom_target(clang-analyze-check-${target} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + COMMAND ${CLANG_CHECK_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${_sources}) add_dependencies(clang-analyze-check-${target} ${target}) add_dependencies(clang-analyze-check clang-analyze-check-${target}) else() diff --git a/CMLibCodeAnalysisClangTidy.cmake b/CMLibCodeAnalysisClangTidy.cmake index 8b272bd..ce95052 100644 --- a/CMLibCodeAnalysisClangTidy.cmake +++ b/CMLibCodeAnalysisClangTidy.cmake @@ -22,9 +22,8 @@ function(add_clang_tidy_check target) if(NOT TARGET clang-tidy-check) add_custom_target(clang-tidy-check) endif() - add_custom_target( - clang-tidy-check-${target} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMMAND ${CLANG_TIDY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${_sources}) + add_custom_target(clang-tidy-check-${target} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + COMMAND ${CLANG_TIDY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${_sources}) add_dependencies(clang-tidy-check-${target} ${target}) add_dependencies(clang-tidy-check clang-tidy-check-${target}) else() diff --git a/CMLibCodeAnalysisClazy.cmake b/CMLibCodeAnalysisClazy.cmake index d685967..1672427 100644 --- a/CMLibCodeAnalysisClazy.cmake +++ b/CMLibCodeAnalysisClazy.cmake @@ -2,16 +2,16 @@ function(add_clazy_check target) find_program(CLAZY_EXE NAMES clazy-standalone) set(_sources ${ARGN}) set(_clazy_checks - "container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,isempty-vs-count,qt-keywords,unneeded-cast") + "container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,isempty-vs-count,qt-keywords,unneeded-cast" + ) set(_args -checks=level2,${_clazy_checks} -extra-arg="-Wno-unknown-warning-option") if(CLAZY_EXE) if(NOT TARGET clazy-check) add_custom_target(clazy-check) endif() - add_custom_target( - clazy-check-${target} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMMAND ${CLAZY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${_sources}) + add_custom_target(clazy-check-${target} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + COMMAND ${CLAZY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${_sources}) add_dependencies(clazy-check-${target} ${target}) add_dependencies(clazy-check clazy-check-${target}) else() diff --git a/CMLibRequiredVariables.cmake b/CMLibRequiredVariables.cmake index 6980fb3..4c4aa3d 100644 --- a/CMLibRequiredVariables.cmake +++ b/CMLibRequiredVariables.cmake @@ -17,4 +17,3 @@ endif() if(NOT CPACK_PACKAGE_DESCRIPTION_SUMMARY) message(FATAL_ERROR "Required variable CPACK_PACKAGE_DESCRIPTION_SUMMARY is not defined") endif() -