Compare commits

..

No commits in common. "87572438e4aa09da82aec9f840462362d1ee1906" and "8b2fa4fd6440d1eec57c783ae2ef9910e317b3b8" have entirely different histories.

16 changed files with 142 additions and 200 deletions

View File

@ -175,7 +175,7 @@ with section("markup"):
with section("lint"):
# a list of lint codes to disable
disabled_codes = ['C0111','C0113']
disabled_codes = ['C0113']
# regular expression pattern describing valid function names
function_pattern = '[0-9a-z_]+'

View File

@ -1,7 +1,5 @@
cmake_policy(SET CMP0057 NEW)
option(CMLIB_ENABLE_WARNING_FLAGS "Enable autodetected warning flags" ON)
# Добавление конфигурации для профилирования
if(CMAKE_CONFIGURATION_TYPES)
if(NOT "Profile" IN_LIST CMAKE_CONFIGURATION_TYPES)
@ -37,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} ${_gcc_profile_flags}"
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)
@ -56,19 +53,12 @@ elseif(CMAKE_BUILD_TYPE STREQUAL Debug)
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${_gcc_debug_flags}" CACHE STRING "" FORCE)
string(REPLACE " ${_gcc_debug_flags}" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
if(CMLIB_ENABLE_WARNING_FLAGS)
set(CMAKE_CXX_FLAGS_DEBUG
"${CMAKE_CXX_FLAGS_DEBUG} ${CMLIB_DETECTED_CXX_FLAGS_DEBUG} ${_gcc_debug_flags}" CACHE STRING ""
FORCE)
else()
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${_gcc_debug_flags}" CACHE STRING "" FORCE)
endif()
endif()
set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "Enable generation of verbose build scripts." FORCE)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE BOOL "Enable generation of compile_commands.json." FORCE)
set(DEBUG 1)
elseif(CMAKE_BUILD_TYPE STREQUAL Release)
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${CMLIB_DETECTED_CXX_FLAGS}" CACHE STRING "" FORCE)
set(RELEASE 1)
elseif(CMAKE_BUILD_TYPE STREQUAL None)
# Режим None используется для статического анализа кода

View File

@ -49,9 +49,9 @@ if(CMLIB_CPACK_DEFAULT_SCHEME)
set(CPACK_DEBIAN_LIBS-DEV_PACKAGE_DEPENDS "lib${CMLIB_PROJECT_NAME_LOWER}-base-dev")
foreach(component ${CPACK_COMPONENTS_ALL})
string(TOLOWER ${component} _cl)
string(TOUPPER ${component} _cu)
foreach(_C ${CPACK_COMPONENTS_ALL})
string(TOLOWER ${_C} _cl)
string(TOUPPER ${_C} _cu)
# Правила формирования имени пакета и файла для остальных компонентов
if(NOT ${_cl} STREQUAL main AND NOT ${_cl} STREQUAL base-dev AND NOT ${_cl} STREQUAL libs-dev)
set(CPACK_DEBIAN_${_cu}_PACKAGE_NAME "${CMLIB_PROJECT_NAME_LOWER}-${_cl}")

View File

@ -5,14 +5,15 @@ function(add_common_library target)
set(multiValueArgs SOURCES)
cmake_parse_arguments(_LOCAL "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
set(SOURCES ${_LOCAL_SOURCES})
if(_LOCAL_OUTPUT_NAME)
set(output_name ${_LOCAL_OUTPUT_NAME})
set(OUTNAME ${_LOCAL_OUTPUT_NAME})
else()
set(output_name ${target})
set(OUTNAME ${target})
endif()
add_library(${target} OBJECT ${_LOCAL_SOURCES})
add_library(${target} OBJECT ${SOURCES})
target_include_directories(
${target} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include> $<INSTALL_INTERFACE:include/${target}>)
@ -21,7 +22,7 @@ function(add_common_library target)
# cmake-format: off
if(BUILD_SHARED_LIBS)
add_library(${target}_shared SHARED $<TARGET_OBJECTS:${target}>)
set_target_properties(${target}_shared PROPERTIES OUTPUT_NAME ${output_name}
set_target_properties(${target}_shared PROPERTIES OUTPUT_NAME ${OUTNAME}
VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
install(TARGETS ${target}_shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
@ -29,7 +30,7 @@ function(add_common_library target)
if(NOT SKIP_STATIC_LIBS)
add_library(${target}_static STATIC $<TARGET_OBJECTS:${target}>)
set_target_properties(${target}_static PROPERTIES OUTPUT_NAME ${output_name}
set_target_properties(${target}_static PROPERTIES OUTPUT_NAME ${OUTNAME}
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
install(TARGETS ${target}_static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()

View File

@ -10,8 +10,8 @@ function(common_target_properties target)
endif()
get_target_property(__sources ${target} SOURCES)
foreach(src IN LISTS __sources)
string(REGEX MATCH ".*/qrc_.*\\.cpp$" __qrc ${src})
foreach(__src IN LISTS __sources)
string(REGEX MATCH ".*/qrc_.*\\.cpp$" __qrc ${__src})
if(__qrc)
set_property(SOURCE ${__qrc} PROPERTY COTIRE_EXCLUDED ON)
endif()

View File

@ -1,5 +1,7 @@
# based on https://github.com/bluescarni/yacma
option(CMLIB_WARNING_FLAGS "Enable warning flags" ON)
include(CheckCXXCompilerFlag)
macro(CHECK_ENABLE_CXX_FLAG flag)
@ -8,8 +10,8 @@ macro(CHECK_ENABLE_CXX_FLAG flag)
unset(CMAKE_REQUIRED_QUIET)
if(CHECK_CXX_FLAG)
message(STATUS "'${flag}': flag is supported.")
string(CONCAT _CMLIB_DETECTED_CXX_FLAGS "${_CMLIB_DETECTED_CXX_FLAGS} ${flag}")
message(STATUS "'${flag}': flag is enabled.")
add_compile_options("${flag}")
else()
message(STATUS "'${flag}': flag is NOT supported.")
endif()
@ -17,21 +19,6 @@ macro(CHECK_ENABLE_CXX_FLAG flag)
unset(CHECK_CXX_FLAG CACHE)
endmacro()
macro(CHECK_ENABLE_DEBUG_CXX_FLAG flag)
set(CMAKE_REQUIRED_QUIET TRUE)
check_cxx_compiler_flag("${flag}" CHECK_CXX_FLAG_DEBUG)
unset(CMAKE_REQUIRED_QUIET)
if(CHECK_CXX_FLAG_DEBUG)
message(STATUS "'${flag}': debug flag is supported.")
string(CONCAT _CMLIB_DETECTED_CXX_FLAGS_DEBUG "${_CMLIB_DETECTED_CXX_FLAGS_DEBUG} ${flag}")
else()
message(STATUS "'${flag}': debug flag is NOT supported.")
endif()
# NOTE: check_cxx_compiler stores variables in the cache.
unset(CHECK_CXX_FLAG_DEBUG CACHE)
endmacro()
function(cmlib_set_cxx_standard version)
# Выбор стандарта по умолчанию (можно переопределить в проекте)
set(CMAKE_CXX_STANDARD_REQUIRED YES PARENT_SCOPE)
@ -74,96 +61,88 @@ function(cmlib_set_cxx_standard version)
endif()
endfunction()
if(NOT CMLIB_CXX_FLAGS_AUTODETECTION_DONE)
set(_CMLIB_DETECTED_CXX_FLAGS "")
set(_CMLIB_DETECTED_CXX_FLAGS_DEBUG "")
# cmake-format: off
if(LSB_DISTRIBUTOR_ID STREQUAL "AstraLinuxSE" AND
LSB_CODENAME STREQUAL "smolensk" AND
LSB_RELEASE STREQUAL "1.5")
# cmake-format: on
cmlib_set_cxx_standard(11)
# Configuration bits specific for clang.
if(CMAKE_CXX_COMPILER_IS_CLANG)
# For now it seems like -Wshadow from clang behaves better than GCC's,
# just enable it here for the time being.
check_enable_debug_cxx_flag(-Wshadow)
# New warnings in clang 8.
# NOTE: a few issues with macros here, let's disable for now.
# CHECK_ENABLE_DEBUG_CXX_FLAG(-Wextra-semi-stmt)
# New warnings in clang 10.
check_enable_debug_cxx_flag(-Wtautological-overlap-compare)
check_enable_debug_cxx_flag(-Wtautological-compare)
check_enable_debug_cxx_flag(-Wtautological-bitwise-compare)
check_enable_debug_cxx_flag(-Wbitwise-conditional-parentheses)
check_enable_debug_cxx_flag(-Wrange-loop-analysis)
check_enable_debug_cxx_flag(-Wmisleading-indentation)
check_enable_debug_cxx_flag(-Wc99-designator)
check_enable_debug_cxx_flag(-Wreorder-init-list)
check_enable_debug_cxx_flag(-Wsizeof-pointer-div)
check_enable_debug_cxx_flag(-Wsizeof-array-div)
check_enable_debug_cxx_flag(-Wxor-used-as-pow)
check_enable_debug_cxx_flag(-Wfinal-dtor-non-final-class)
set(_CMAKE_TOOLCHAIN_PREFIX "x86_64-linux-gnu-")
set(_CMAKE_TOOLCHAIN_SUFFIX "-4.7")
set(_CMAKE_TOOLCHAIN_LOCATION} "/usr/bin")
else()
cmlib_set_cxx_standard(17)
# -Wshadow gives a lot of false positives with GCC 4.7.2 in Astra Linux 1.5
if(CMAKE_CXX_COMPILER_IS_GCC)
check_enable_cxx_flag(-Wshadow)
endif()
endif()
# Common configuration for GCC, clang and Intel.
if(CMAKE_CXX_COMPILER_IS_CLANG OR CMAKE_CXX_COMPILER_IS_INTEL OR CMAKE_CXX_COMPILER_IS_GCC)
check_enable_debug_cxx_flag(-Wall)
check_enable_debug_cxx_flag(-Wextra)
check_enable_debug_cxx_flag(-Wnon-virtual-dtor)
check_enable_debug_cxx_flag(-Wnoexcept)
check_enable_debug_cxx_flag(-Wlogical-op)
check_enable_debug_cxx_flag(-Wconversion)
check_enable_debug_cxx_flag(-Wdeprecated)
if(CMLIB_WARNING_FLAGS AND CMAKE_BUILD_TYPE STREQUAL "Debug")
check_enable_cxx_flag(-Wall)
check_enable_cxx_flag(-Wextra)
check_enable_cxx_flag(-Wnon-virtual-dtor)
check_enable_cxx_flag(-Wnoexcept)
check_enable_cxx_flag(-Wlogical-op)
check_enable_cxx_flag(-Wconversion)
check_enable_cxx_flag(-Wdeprecated)
# This limit is supposed to be at least 1024 in C++11, but for some reason
# clang sets this to 256, and gcc to 900.
check_enable_cxx_flag(-ftemplate-depth=1024)
check_enable_debug_cxx_flag(-Wold-style-cast)
check_enable_debug_cxx_flag(-Wdisabled-optimization)
check_enable_cxx_flag(-Wold-style-cast)
check_enable_cxx_flag(-Wdisabled-optimization)
# This is useful when the compiler decides the template backtrace is too
# verbose.
check_enable_debug_cxx_flag(-ftemplate-backtrace-limit=0)
check_enable_debug_cxx_flag(-fstack-protector-all)
check_enable_cxx_flag(-ftemplate-backtrace-limit=0)
check_enable_cxx_flag(-fstack-protector-all)
# A few suggestion flags.
check_enable_debug_cxx_flag(-Wsuggest-attribute=pure)
check_enable_debug_cxx_flag(-Wsuggest-attribute=const)
check_enable_debug_cxx_flag(-Wsuggest-attribute=noreturn)
check_enable_debug_cxx_flag(-Wsuggest-attribute=format)
check_enable_cxx_flag(-Wsuggest-attribute=pure)
check_enable_cxx_flag(-Wsuggest-attribute=const)
check_enable_cxx_flag(-Wsuggest-attribute=noreturn)
check_enable_cxx_flag(-Wsuggest-attribute=format)
# From GCC 5.
check_enable_debug_cxx_flag(-Wodr)
check_enable_debug_cxx_flag(-Wsuggest-final-types)
check_enable_debug_cxx_flag(-Wsuggest-final-methods)
check_enable_debug_cxx_flag(-Wsuggest-override)
check_enable_cxx_flag(-Wodr)
check_enable_cxx_flag(-Wsuggest-final-types)
check_enable_cxx_flag(-Wsuggest-final-methods)
check_enable_cxx_flag(-Wsuggest-override)
# From GCC 6.
check_enable_debug_cxx_flag(-Wshift-negative-value)
check_enable_debug_cxx_flag(-Wshift-overflow=2)
check_enable_debug_cxx_flag(-Wduplicated-cond)
check_enable_debug_cxx_flag(-Wnull-dereference)
check_enable_cxx_flag(-Wshift-negative-value)
check_enable_cxx_flag(-Wshift-overflow=2)
check_enable_cxx_flag(-Wduplicated-cond)
check_enable_cxx_flag(-Wnull-dereference)
# From GCC 7.
check_enable_debug_cxx_flag(-Wrestrict)
check_enable_debug_cxx_flag(-Waligned-new)
check_enable_debug_cxx_flag(-fdiagnostics-parseable-fixits)
check_enable_debug_cxx_flag(-fdiagnostics-generate-patch)
check_enable_cxx_flag(-Wrestrict)
check_enable_cxx_flag(-Waligned-new)
# From GCC 8.
check_enable_debug_cxx_flag(-Wcast-align=strict)
check_enable_cxx_flag(-Wcast-align=strict)
# This is supposed to produce a nice graphical visualization of mismatching
# template errors.
check_enable_cxx_flag(-fdiagnostics-show-template-tree)
check_enable_debug_cxx_flag(-fdiagnostics-show-option)
check_enable_cxx_flag(-fdiagnostics-show-option)
check_enable_debug_cxx_flag(-pedantic)
check_enable_debug_cxx_flag(-Wcast-align)
check_enable_debug_cxx_flag(-Wcast-qual)
check_enable_debug_cxx_flag(-Wctor-dtor-privacy)
check_enable_debug_cxx_flag(-Wdisabled-optimization)
check_enable_debug_cxx_flag(-Wformat=2)
check_enable_debug_cxx_flag(-Winit-self)
check_enable_debug_cxx_flag(-Wmissing-include-dirs)
check_enable_debug_cxx_flag(-Woverloaded-virtual)
check_enable_debug_cxx_flag(-Wredundant-decls)
check_enable_debug_cxx_flag(-Wsign-promo)
check_enable_debug_cxx_flag(-Wstrict-overflow=5)
check_enable_debug_cxx_flag(-Wundef)
check_enable_debug_cxx_flag(-Wno-unused)
check_enable_debug_cxx_flag(-Wno-variadic-macros)
check_enable_debug_cxx_flag(-Wno-parentheses)
check_enable_debug_cxx_flag(-Wstrict-null-sentinel)
check_enable_debug_cxx_flag(-Wshadow-all)
check_enable_cxx_flag(-pedantic)
check_enable_cxx_flag(-Wcast-align)
check_enable_cxx_flag(-Wcast-qual)
check_enable_cxx_flag(-Wctor-dtor-privacy)
check_enable_cxx_flag(-Wdisabled-optimization)
check_enable_cxx_flag(-Wformat=2)
check_enable_cxx_flag(-Winit-self)
check_enable_cxx_flag(-Wmissing-include-dirs)
check_enable_cxx_flag(-Woverloaded-virtual)
check_enable_cxx_flag(-Wredundant-decls)
check_enable_cxx_flag(-Wsign-promo)
check_enable_cxx_flag(-Wstrict-overflow=5)
check_enable_cxx_flag(-Wundef)
check_enable_cxx_flag(-Wno-unused)
check_enable_cxx_flag(-Wno-variadic-macros)
check_enable_cxx_flag(-Wno-parentheses)
check_enable_cxx_flag(-Wstrict-null-sentinel)
check_enable_cxx_flag(-Wshadow-all)
endif()
endif()
if(CMAKE_CXX_COMPILER_IS_GCC)
@ -171,10 +150,7 @@ if(NOT CMLIB_CXX_FLAGS_AUTODETECTION_DONE)
# The -Wmaybe-uninitialized flag is enabled by -Wall,
# but it is known to emit a lot of possibly spurious warnings.
# Let's just disable it.
check_enable_debug_cxx_flag(-Wno-maybe-uninitialized)
# New in GCC 9.
check_enable_debug_cxx_flag(-Waddress-of-packed-member)
check_enable_cxx_flag(-Wno-maybe-uninitialized)
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "5.999")
# NOTE: GCC >= 6 seems to be wrongly warning about visibility attributes
# in some situations:
@ -184,32 +160,7 @@ if(NOT CMLIB_CXX_FLAGS_AUTODETECTION_DONE)
endif()
endif()
# cmake-format: off
if(LSB_DISTRIBUTOR_ID STREQUAL "AstraLinuxSE" AND
LSB_CODENAME STREQUAL "smolensk" AND
LSB_RELEASE STREQUAL "1.5")
# cmake-format: on
cmlib_set_cxx_standard(11)
set(_CMAKE_TOOLCHAIN_PREFIX "x86_64-linux-gnu-" CACHE INTERNAL "" FORCE)
set(_CMAKE_TOOLCHAIN_SUFFIX "-4.7" CACHE INTERNAL "" FORCE)
set(_CMAKE_TOOLCHAIN_LOCATION "/usr/bin" CACHE INTERNAL "" FORCE)
else()
cmlib_set_cxx_standard(17)
# -Wshadow gives a lot of false positives with GCC 4.7.2 in Astra Linux 1.5
if(CMAKE_CXX_COMPILER_IS_GCC)
check_enable_debug_cxx_flag(-Wshadow)
endif()
endif()
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "e2k")
check_enable_debug_cxx_flag(-Wno-invalid-offsetof)
check_enable_cxx_flag(-Wno-invalid-offsetof)
list(APPEND CMAKE_LIBRARY_PATH "/usr/lib/e2k-linux-gnu")
endif()
# Set the cache variables.
set(CMLIB_DETECTED_CXX_FLAGS "${_CMLIB_DETECTED_CXX_FLAGS}" CACHE INTERNAL "")
set(CMLIB_DETECTED_CXX_FLAGS_DEBUG "${_CMLIB_DETECTED_CXX_FLAGS_DEBUG}" CACHE INTERNAL "")
set(CMLIB_CXX_FLAGS_AUTODETECTION_DONE YES CACHE INTERNAL "")
endif()

View File

@ -14,8 +14,8 @@ endif()
# Очистка от сгенерированных файлов
file(GLOB_RECURSE _cmakelists_files RELATIVE ${_source_realpath} CMakeLists.txt)
foreach(it ${_cmakelists_files})
get_filename_component(_file ${it} REALPATH)
foreach(_it ${_cmakelists_files})
get_filename_component(_file ${_it} REALPATH)
get_filename_component(_dir ${_file} DIRECTORY)
file(
REMOVE_RECURSE

View File

@ -1,10 +1,10 @@
find_program(DISTCC_EXECUTABLE distcc)
mark_as_advanced(DISTCC_EXECUTABLE)
if(DISTCC_EXECUTABLE)
foreach(lang C CXX)
if(NOT DEFINED CMAKE_${lang}_COMPILER_LAUNCHER AND NOT CMAKE_${lang}_COMPILER MATCHES ".*/distcc$")
message(STATUS "Enabling distcc for ${lang}")
set(CMAKE_${lang}_COMPILER_LAUNCHER ${DISTCC_EXECUTABLE} CACHE STRING "")
foreach(LANG C CXX)
if(NOT DEFINED CMAKE_${LANG}_COMPILER_LAUNCHER AND NOT CMAKE_${LANG}_COMPILER MATCHES ".*/distcc$")
message(STATUS "Enabling distcc for ${LANG}")
set(CMAKE_${LANG}_COMPILER_LAUNCHER ${DISTCC_EXECUTABLE} CACHE STRING "")
endif()
endforeach()
endif()

View File

@ -25,15 +25,15 @@ function(add_doxygen target)
set(GENERATE_LATEX YES)
endif()
set(work_dir ${CMAKE_BINARY_DIR}/doc/doxygen)
configure_file(${CMAKE_SOURCE_DIR}/cmake/doc/Doxyfile.in ${work_dir}/Doxyfile @ONLY)
set(WORK_DIR ${CMAKE_BINARY_DIR}/doc/doxygen)
configure_file(${CMAKE_SOURCE_DIR}/cmake/doc/Doxyfile.in ${WORK_DIR}/Doxyfile @ONLY)
add_custom_target(
${target}
VERBATIM
COMMAND "${CMAKE_COMMAND}" -E remove -f "${work_dir}/doxygen_sqlite3.db"
COMMAND ${DOXYGEN_EXECUTABLE} ${work_dir}/Doxyfile
WORKING_DIRECTORY ${work_dir}
COMMAND "${CMAKE_COMMAND}" -E remove -f "${WORK_DIR}/doxygen_sqlite3.db"
COMMAND ${DOXYGEN_EXECUTABLE} ${WORK_DIR}/Doxyfile
WORKING_DIRECTORY ${WORK_DIR}
COMMENT "Generating API documentation with Doxygen")
else()
message(STATUS "CMLIB warning:")

View File

@ -6,7 +6,6 @@
#
# Pre: apply_global_cxx_flags_to_all_targets() must be invoked.
#
# cmake-lint: disable=C0103
macro(remove_flag_from_target _target _flag)
get_target_property(_target_cxx_flags ${_target} COMPILE_OPTIONS)
if(_target_cxx_flags)
@ -23,7 +22,6 @@ endmacro()
#
# Pre: apply_global_cxx_flags_to_all_targets() must be invoked.
#
# cmake-lint: disable=C0103
macro(remove_flag_from_file _target _file _flag)
get_target_property(_target_sources ${_target} SOURCES)
# Check if a sync is required, in which case we'll force a rewrite of the cache variables.

View File

@ -2,13 +2,13 @@ function(cmlib_generate_private_config_hpp)
include(CMLibLargeFiles)
cmlib_test_large_files(HAVE_LARGEFILES)
set(output_file ${CMAKE_BINARY_DIR}/include/cmlib_private_config.hpp)
set(OUTPUT_FILE ${CMAKE_BINARY_DIR}/include/cmlib_private_config.hpp)
if(CMLIB_GENERATED_HEADERS_PATH)
set(output_file ${CMLIB_GENERATED_HEADERS_PATH}/cmlib_private_config.hpp)
set(OUTPUT_FILE ${CMLIB_GENERATED_HEADERS_PATH}/cmlib_private_config.hpp)
elseif(ARGV0)
set(output_file ${ARGV0})
set(OUTPUT_FILE ${ARGV0})
endif()
get_property(PROJECT_VERSION_INT GLOBAL PROPERTY PROJECT_VERSION_INT)
configure_file(${CMLIB_MODULE_DIR}/hpp/cmlib_private_config.hpp.in ${output_file})
configure_file(${CMLIB_MODULE_DIR}/hpp/cmlib_private_config.hpp.in ${OUTPUT_FILE})
endfunction()

View File

@ -1,14 +1,14 @@
function(canonical_string in_string out_string)
string(TOUPPER ${in_string} _arg_uppercase)
function(canonical_string INV OUTV)
string(TOUPPER ${INV} _arg_uppercase)
string(REGEX REPLACE "[ -]" "_" _arg_fixed ${_arg_uppercase})
set(${out_string} ${_arg_fixed} PARENT_SCOPE)
set(${OUTV} ${_arg_fixed} PARENT_SCOPE)
endfunction()
# Добавление общего префикса ко всем переменным в списке
function(list_transform_prepend var prefix)
set(temp "")
foreach(filename ${${var}})
list(APPEND temp "${prefix}${filename}")
foreach(f ${${var}})
list(APPEND temp "${prefix}${f}")
endforeach()
set(${var} "${temp}" PARENT_SCOPE)
endfunction()

View File

@ -23,9 +23,9 @@ if(CMLIB_ADD_THEME_PREFIX AND NOT CMLIB_THEME_PREFIX_APPENDED)
endif()
# CMLIB_MODULE_DIR
foreach(module ${CMAKE_MODULE_PATH})
if(EXISTS ${module}/CMLibCommon.cmake)
get_filename_component(CMLIB_MODULE_DIR ${module}/CMLibCommon.cmake DIRECTORY)
foreach(_m ${CMAKE_MODULE_PATH})
if(EXISTS ${_m}/CMLibCommon.cmake)
get_filename_component(CMLIB_MODULE_DIR ${_m}/CMLibCommon.cmake DIRECTORY)
break()
endif()
endforeach()

View File

@ -16,11 +16,14 @@ if(EXISTS /etc/mcst_version)
execute_process(COMMAND cat /etc/mcst_version OUTPUT_VARIABLE LSB_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE)
else()
find_program(_lsb_release_executable lsb_release)
# cmake-format: off
if(_lsb_release_executable)
execute_process(COMMAND ${_lsb_release_executable} -si OUTPUT_VARIABLE LSB_DISTRIBUTOR_ID OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND ${_lsb_release_executable} -sc OUTPUT_VARIABLE LSB_CODENAME OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND ${_lsb_release_executable} -sr OUTPUT_VARIABLE LSB_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE)
# cmake-format: on
execute_process(COMMAND ${_lsb_release_executable} -si OUTPUT_VARIABLE LSB_DISTRIBUTOR_ID
OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND ${_lsb_release_executable} -sc OUTPUT_VARIABLE LSB_CODENAME
OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND ${_lsb_release_executable} -sr OUTPUT_VARIABLE LSB_RELEASE
OUTPUT_STRIP_TRAILING_WHITESPACE)
endif()
endif()

View File

@ -129,7 +129,6 @@ macro(cmlib_test_large_files VARIABLE)
endif()
endif()
# cmake-lint: disable=C0103
if(NOT FILE64_OK)
# now check for Windows stuff
try_compile(FILE64_OK "${CMAKE_BINARY_DIR}" "${CMLIB_MODULE_DIR}/tests/TestWindowsFSeek.c")

View File

@ -11,22 +11,22 @@ function(qt5_translation outfiles)
set(_output_dir ${_QTTR_OUTPUT_DIR})
set(_languages ${_QTTR_LANGUAGES})
set(_l10n_qrc_body "")
set(L10N_QRC_BODY "")
make_directory(${_output_dir})
foreach(lang ${_languages})
set(_ts "${_base_name}_${lang}.ts")
set(_qm "${_base_name}_${lang}.qm")
foreach(_lang ${_languages})
set(_ts "${_base_name}_${_lang}.ts")
set(_qm "${_base_name}_${_lang}.qm")
list(APPEND _ts_list ${_output_dir}/${_ts})
list(APPEND _l10n_names_list "${_base_name}_l10n_${lang}")
string(APPEND _l10n_qrc_body "<file alias=\"${_qm}\">${CMAKE_BINARY_DIR}/${_qm}</file>\n")
list(APPEND _l10n_names_list "${_base_name}_l10n_${_lang}")
string(APPEND L10N_QRC_BODY "<file alias=\"${_qm}\">${CMAKE_BINARY_DIR}/${_qm}</file>\n")
add_custom_target(
${_base_name}_l10n_${lang} COMMAND ${Qt5_LUPDATE_EXECUTABLE} ${_sources} -ts ${_output_dir}/${_ts}
-target-language ${lang} DEPENDS ${_sources})
${_base_name}_l10n_${_lang} COMMAND ${Qt5_LUPDATE_EXECUTABLE} ${_sources} -ts ${_output_dir}/${_ts}
-target-language ${_lang} DEPENDS ${_sources})
if(NOT EXISTS "${_output_dir}/${_ts}")
add_custom_target(${_ts} DEPENDS ${_base_name}_l10n_${lang})
add_custom_target(${_ts} DEPENDS ${_base_name}_l10n_${_lang})
else()
add_custom_target(${_ts} COMMAND echo "Skipping lupdate for ${_ts}")
endif()