From ec1d917195db831f7f42bdbb4446d95e2f98a165 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Sun, 30 May 2021 20:32:08 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMLibBuildTypes.cmake | 3 +-- CMLibCommonTargetProperties.cmake | 16 ++++++++-------- CMLibExternalProject.cmake | 1 - CMLibGlobalFunctions.cmake | 10 +++++----- CMLibLSBInfo.cmake | 6 +++--- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/CMLibBuildTypes.cmake b/CMLibBuildTypes.cmake index 9779e79..47f83ef 100644 --- a/CMLibBuildTypes.cmake +++ b/CMLibBuildTypes.cmake @@ -35,8 +35,7 @@ if(CMAKE_BUILD_TYPE STREQUAL Profile) CACHE STRING "" FORCE) set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${_gcc_profile_flags}" CACHE STRING "" FORCE) - set(CMAKE_STATIC_LINKER_FLAGS_PROFILE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE}" - CACHE STRING "" FORCE) + set(CMAKE_STATIC_LINKER_FLAGS_PROFILE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE}" CACHE STRING "" FORCE) set(CMAKE_MODULE_LINKER_FLAGS_PROFILE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} ${_gcc_profile_flags}" CACHE STRING "" FORCE) elseif(CMAKE_CXX_COMPILER_IS_Intel) diff --git a/CMLibCommonTargetProperties.cmake b/CMLibCommonTargetProperties.cmake index 07f36b9..e49b7b4 100644 --- a/CMLibCommonTargetProperties.cmake +++ b/CMLibCommonTargetProperties.cmake @@ -69,9 +69,12 @@ function(common_target_properties target) endif() endif() - set_property(TARGET ${target} PROPERTY COTIRE_ENABLE_PRECOMPILED_HEADER - ${CMLIB_COTIRE_ENABLE_PRECOMPILED_HEADER}) - set_property(TARGET ${target} PROPERTY COTIRE_ADD_UNITY_BUILD ${CMLIB_COTIRE_ADD_UNITY_BUILD}) + # cmake-format: off + set_property(TARGET ${target} + PROPERTY COTIRE_ENABLE_PRECOMPILED_HEADER ${CMLIB_COTIRE_ENABLE_PRECOMPILED_HEADER}) + set_property(TARGET ${target} + PROPERTY COTIRE_ADD_UNITY_BUILD ${CMLIB_COTIRE_ADD_UNITY_BUILD}) +# cmake-format: on if(CMAKE_BUILD_TYPE STREQUAL Profile) target_compile_definitions(${target} ${__visibility} PROFILE) @@ -82,9 +85,6 @@ function(common_target_properties target) elseif(CMAKE_BUILD_TYPE STREQUAL None) target_compile_definitions(${target} ${__visibility} ANALYSIS) endif() - target_compile_definitions( - ${target} - ${__visibility} - "TARGET_LSB_ID_${LSB_DISTRIBUTOR_ID}" - "TARGET_LSB_CODENAME_${LSB_CODENAME}") + target_compile_definitions(${target} ${__visibility} "TARGET_LSB_ID_${LSB_DISTRIBUTOR_ID}") + target_compile_definitions(${target} ${__visibility} "TARGET_LSB_CODENAME_${LSB_CODENAME}") endfunction() diff --git a/CMLibExternalProject.cmake b/CMLibExternalProject.cmake index 0dcaaee..e223d20 100644 --- a/CMLibExternalProject.cmake +++ b/CMLibExternalProject.cmake @@ -43,4 +43,3 @@ endif() if(Qt5Core_DIR) list(APPEND CMLIB_EXT_PROJ_DEFAULT_ARGS -DQt5Core_DIR=${Qt5Core_DIR}) endif() - diff --git a/CMLibGlobalFunctions.cmake b/CMLibGlobalFunctions.cmake index 22c0db4..1852c00 100644 --- a/CMLibGlobalFunctions.cmake +++ b/CMLibGlobalFunctions.cmake @@ -6,9 +6,9 @@ endfunction() # Добавление общего префикса ко всем переменным в списке function(list_transform_prepend var prefix) - set(temp "") - foreach(f ${${var}}) - list(APPEND temp "${prefix}${f}") - endforeach() - set(${var} "${temp}" PARENT_SCOPE) + set(temp "") + foreach(f ${${var}}) + list(APPEND temp "${prefix}${f}") + endforeach() + set(${var} "${temp}" PARENT_SCOPE) endfunction() diff --git a/CMLibLSBInfo.cmake b/CMLibLSBInfo.cmake index cf46c14..4753357 100644 --- a/CMLibLSBInfo.cmake +++ b/CMLibLSBInfo.cmake @@ -18,12 +18,12 @@ else() find_program(_lsb_release_executable lsb_release) if(_lsb_release_executable) execute_process(COMMAND ${_lsb_release_executable} -si OUTPUT_VARIABLE LSB_DISTRIBUTOR_ID - OUTPUT_STRIP_TRAILING_WHITESPACE) + OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND ${_lsb_release_executable} -sc OUTPUT_VARIABLE LSB_CODENAME - OUTPUT_STRIP_TRAILING_WHITESPACE) + OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND ${_lsb_release_executable} -sr OUTPUT_VARIABLE LSB_RELEASE - OUTPUT_STRIP_TRAILING_WHITESPACE) + OUTPUT_STRIP_TRAILING_WHITESPACE) endif() endif()