f1x1t/cmlib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Чистка кода

Browse Source
This commit is contained in:
Andrei Astafev 2020-04-18 19:44:16 +03:00
parent f0a7996d26
commit f97349f404
3 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMLibCPackDeb.cmake
View File

@ -11,10 +11,6 @@ if(NOT CPACK_DEBIAN_PACKAGE_PRIORITY)
set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional") set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
endif() endif()
#if(NOT CPACK_SOURCE_IGNORE_FILES)
# message(FATAL_ERROR "Required variable CPACK_SOURCE_IGNORE_FILES is not defined")
#endif()
# По умолчанию пакет для Debian делится на компоненты # По умолчанию пакет для Debian делится на компоненты
if(NOT CPACK_DEB_COMPONENT_INSTALL) if(NOT CPACK_DEB_COMPONENT_INSTALL)
set(CPACK_DEB_COMPONENT_INSTALL ON) set(CPACK_DEB_COMPONENT_INSTALL ON)

4
CMLibCodeCoverage.cmake
View File

@ -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(LCOV_EXE NAMES lcov)
find_program(GENHTML_EXE NAMES genhtml) find_program(GENHTML_EXE NAMES genhtml)
function(add_code_coverage target) function(add_code_coverage target)
if(ENABLE_CODE_COVERAGE) if(CMLIB_ENABLE_CODE_COVERAGE)
if(CMAKE_CXX_COMPILER_IS_GCC) if(CMAKE_CXX_COMPILER_IS_GCC)
target_compile_options(${target} PUBLIC "--coverage") target_compile_options(${target} PUBLIC "--coverage")
get_target_property(LF ${target} LINK_FLAGS) get_target_property(LF ${target} LINK_FLAGS)

12
CMLibCommonTargetProperties.cmake
View File

@ -33,18 +33,6 @@ function(common_target_properties target)
if(_targetType STREQUAL "EXECUTABLE") if(_targetType STREQUAL "EXECUTABLE")
target_compile_options(${target} PUBLIC "${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") target_compile_options(${target} PUBLIC "${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
endif() 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
# $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/${target}_autogen/include>
# )
# endif()
endif() endif()
if(CMAKE_CXX_COMPILER_IS_GCC AND NOT APPLE) if(CMAKE_CXX_COMPILER_IS_GCC AND NOT APPLE)
set_target_properties(${target} PROPERTIES LINK_FLAGS "-Wl,--no-as-needed") set_target_properties(${target} PROPERTIES LINK_FLAGS "-Wl,--no-as-needed")