From 3c0fd214b9ad8bd9306aba18b37d7078319654b1 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Tue, 14 Apr 2020 12:20:01 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=B4?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMLibCommonLibraryTarget.cmake | 2 +- CMLibCommonTargetProperties.cmake | 2 +- CMLibDocBreathe.cmake | 11 +++++------ CMLibDocDoxygen.cmake | 3 +-- CMLibFormatSources.cmake | 2 +- CMLibNinjaGeneratorHelper.cmake | 3 +-- CMLibQtTranslation.cmake | 2 +- 7 files changed, 11 insertions(+), 14 deletions(-) diff --git a/CMLibCommonLibraryTarget.cmake b/CMLibCommonLibraryTarget.cmake index 0583068..541d6c2 100644 --- a/CMLibCommonLibraryTarget.cmake +++ b/CMLibCommonLibraryTarget.cmake @@ -31,7 +31,7 @@ function(add_common_library target) if(NOT SKIP_STATIC_LIBS) add_library(${target}_static STATIC $) set_target_properties(${target}_static PROPERTIES OUTPUT_NAME ${OUTNAME} ARCHIVE_OUTPUT_DIRECTORY - ${CMAKE_INSTALL_LIBDIR}) + ${CMAKE_INSTALL_LIBDIR}) install(TARGETS ${target}_static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() diff --git a/CMLibCommonTargetProperties.cmake b/CMLibCommonTargetProperties.cmake index 79e1364..5796ec4 100644 --- a/CMLibCommonTargetProperties.cmake +++ b/CMLibCommonTargetProperties.cmake @@ -11,7 +11,7 @@ function(common_target_properties target) get_target_property(__sources ${target} SOURCES) foreach(__src IN LISTS __sources) string(REGEX MATCH ".*/qrc_.*\\.cpp$" __qrc ${__src}) - if (__qrc) + if(__qrc) set_property(SOURCE ${__qrc} PROPERTY COTIRE_EXCLUDED ON) endif() endforeach() diff --git a/CMLibDocBreathe.cmake b/CMLibDocBreathe.cmake index 7dc256e..4ae277b 100644 --- a/CMLibDocBreathe.cmake +++ b/CMLibDocBreathe.cmake @@ -54,8 +54,8 @@ function(add_breathe target) configure_file(${INDEX_MD_FILE} ${WORK_DIR}/index.md @ONLY) file(GLOB MD_FILES ${CMAKE_SOURCE_DIR}/doc/breathe/*.md) if(MD_FILES) - add_custom_command(TARGET ${target} PRE_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${MD_FILES} ${WORK_DIR}) + add_custom_command(TARGET ${target} PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${MD_FILES} ${WORK_DIR}) endif() endif() @@ -64,13 +64,12 @@ function(add_breathe target) configure_file(${INDEX_RST_FILE} ${WORK_DIR}/index.rst @ONLY) file(GLOB RST_FILES ${CMAKE_SOURCE_DIR}/doc/breathe/*.rst) if(RST_FILES) - add_custom_command(TARGET ${target} PRE_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RST_FILES} ${WORK_DIR}) + add_custom_command(TARGET ${target} PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${RST_FILES} ${WORK_DIR}) endif() endif() else() message(STATUS "CMLIB warning:") - add_custom_target(${target} VERBATIM - COMMENT " Breathe is not found. Skipping target ${target} build") + add_custom_target(${target} VERBATIM COMMENT " Breathe is not found. Skipping target ${target} build") endif() endfunction() diff --git a/CMLibDocDoxygen.cmake b/CMLibDocDoxygen.cmake index 8599161..4ad62ef 100644 --- a/CMLibDocDoxygen.cmake +++ b/CMLibDocDoxygen.cmake @@ -37,7 +37,6 @@ function(add_doxygen target) COMMENT "Generating API documentation with Doxygen") else() message(STATUS "CMLIB warning:") - add_custom_target(${target} VERBATIM - COMMENT " Doxygen is not found. Skipping target ${target} build") + add_custom_target(${target} VERBATIM COMMENT " Doxygen is not found. Skipping target ${target} build") endif() endfunction() diff --git a/CMLibFormatSources.cmake b/CMLibFormatSources.cmake index afb211d..8c1ea81 100644 --- a/CMLibFormatSources.cmake +++ b/CMLibFormatSources.cmake @@ -18,7 +18,7 @@ function(add_format_sources target) list(APPEND UNCRUSTIFY_OPTS -c ${CMAKE_SOURCE_DIR}/cmake/etc/uncrustify/default.cfg) endif() add_custom_target(format-sources-uncrustify-${target} COMMAND ${UNCRUSTIFY_EXE} ${UNCRUSTIFY_OPTS} - ${_sources}) + ${_sources}) add_dependencies(format-sources format-sources-uncrustify-${target}) else() message(STATUS "CMLIB warning:") diff --git a/CMLibNinjaGeneratorHelper.cmake b/CMLibNinjaGeneratorHelper.cmake index 0a286b6..3564582 100644 --- a/CMLibNinjaGeneratorHelper.cmake +++ b/CMLibNinjaGeneratorHelper.cmake @@ -4,7 +4,6 @@ # Таким образом можно выполнять команду make, даже если правила # сборки проекта сгенерированы для ninja. -if ("${CMAKE_GENERATOR}" MATCHES ".*Ninja$") +if("${CMAKE_GENERATOR}" MATCHES ".*Ninja$") file(WRITE ${CMAKE_BINARY_DIR}/Makefile ".PHONY: build\n%:\n\t@ninja \$@\nbuild:\n\t@ninja\n") endif() - diff --git a/CMLibQtTranslation.cmake b/CMLibQtTranslation.cmake index aeaed95..ba213ff 100644 --- a/CMLibQtTranslation.cmake +++ b/CMLibQtTranslation.cmake @@ -23,7 +23,7 @@ function(qt5_translation outfiles) add_custom_target( ${_base_name}_l10n_${_lang} COMMAND ${Qt5_LUPDATE_EXECUTABLE} ${_sources} -ts ${_output_dir}/${_ts} - -target-language ${_lang} DEPENDS ${_sources}) + -target-language ${_lang} DEPENDS ${_sources}) if(NOT EXISTS "${_output_dir}/${_ts}") add_custom_target(${_ts} DEPENDS ${_base_name}_l10n_${_lang})