Merge branch 'master' of git.246060.ru:f1x1t/cmlib

This commit is contained in:
Andrei Astafev 2021-07-02 09:56:26 +03:00
commit 061327890c
4 changed files with 24 additions and 18 deletions

View File

@ -18,6 +18,7 @@ macro(CHECK_ENABLE_CXX_FLAG flag)
endmacro()
macro(CHECK_ENABLE_DEBUG_CXX_FLAG flag)
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
set(CMAKE_REQUIRED_QUIET TRUE)
check_cxx_compiler_flag("${flag}" CHECK_CXX_FLAG_DEBUG)
unset(CMAKE_REQUIRED_QUIET)
@ -30,6 +31,7 @@ macro(CHECK_ENABLE_DEBUG_CXX_FLAG flag)
endif()
# NOTE: check_cxx_compiler stores variables in the cache.
unset(CHECK_CXX_FLAG_DEBUG CACHE)
endif()
endmacro()
function(cmlib_set_cxx_standard version)

View File

@ -68,8 +68,10 @@ function(add_breathe_target target)
${RST_FILES} ${WORK_DIR})
endif()
endif()
install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/breathe/
COMPONENT doc OPTIONAL
install(
DIRECTORY ${CMAKE_BINARY_DIR}/doc/breathe/
COMPONENT doc
OPTIONAL
DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/breathe)
else()
message(STATUS "CMLIB warning:")

View File

@ -35,8 +35,10 @@ function(add_doxygen_target target)
COMMAND ${DOXYGEN_EXECUTABLE} ${work_dir}/Doxyfile
WORKING_DIRECTORY ${work_dir}
COMMENT "Generating API documentation with Doxygen")
install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/doxygen/html/
COMPONENT doc OPTIONAL
install(
DIRECTORY ${CMAKE_BINARY_DIR}/doc/doxygen/html/
COMPONENT doc
OPTIONAL
DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/doxygen)
else()
message(STATUS "CMLIB warning:")

View File

@ -11,7 +11,7 @@ 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})
@ -19,7 +19,7 @@ function(qt5_translation outfiles)
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")
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}