From f97349f404632133492fb0b693c3ded4b85c1d62 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Sat, 18 Apr 2020 19:44:16 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A7=D0=B8=D1=81=D1=82=D0=BA=D0=B0=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMLibCPackDeb.cmake | 4 ---- CMLibCodeCoverage.cmake | 4 ++-- CMLibCommonTargetProperties.cmake | 12 ------------ 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/CMLibCPackDeb.cmake b/CMLibCPackDeb.cmake index 8d5b33c..8885675 100644 --- a/CMLibCPackDeb.cmake +++ b/CMLibCPackDeb.cmake @@ -11,10 +11,6 @@ if(NOT CPACK_DEBIAN_PACKAGE_PRIORITY) set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional") endif() -#if(NOT CPACK_SOURCE_IGNORE_FILES) -# message(FATAL_ERROR "Required variable CPACK_SOURCE_IGNORE_FILES is not defined") -#endif() - # По умолчанию пакет для Debian делится на компоненты if(NOT CPACK_DEB_COMPONENT_INSTALL) set(CPACK_DEB_COMPONENT_INSTALL ON) diff --git a/CMLibCodeCoverage.cmake b/CMLibCodeCoverage.cmake index e3d4a7d..3ae2529 100644 --- a/CMLibCodeCoverage.cmake +++ b/CMLibCodeCoverage.cmake @@ -1,10 +1,10 @@ -option(ENABLE_CODE_COVERAGE "Enable code coverage support" OFF) +option(CMLIB_ENABLE_CODE_COVERAGE "Enable code coverage support" OFF) find_program(LCOV_EXE NAMES lcov) find_program(GENHTML_EXE NAMES genhtml) function(add_code_coverage target) - if(ENABLE_CODE_COVERAGE) + if(CMLIB_ENABLE_CODE_COVERAGE) if(CMAKE_CXX_COMPILER_IS_GCC) target_compile_options(${target} PUBLIC "--coverage") get_target_property(LF ${target} LINK_FLAGS) diff --git a/CMLibCommonTargetProperties.cmake b/CMLibCommonTargetProperties.cmake index 5796ec4..02d3f76 100644 --- a/CMLibCommonTargetProperties.cmake +++ b/CMLibCommonTargetProperties.cmake @@ -33,18 +33,6 @@ function(common_target_properties target) if(_targetType STREQUAL "EXECUTABLE") target_compile_options(${target} PUBLIC "${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") endif() - # set_target_properties(${target} PROPERTIES AUTOMOC TRUE) - # set_target_properties(${target} PROPERTIES AUTORCC TRUE) - endif() - if(TARGET Qt5::Widgets) - # set_target_properties(${target} PROPERTIES AUTOUIC TRUE) - # if(CMAKE_VERSION VERSION_LESS 3.7.99) - # target_include_directories( - # ${target} - # PUBLIC - # $ - # ) - # endif() endif() if(CMAKE_CXX_COMPILER_IS_GCC AND NOT APPLE) set_target_properties(${target} PROPERTIES LINK_FLAGS "-Wl,--no-as-needed")