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

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
CMLibCompilerFlags.cmake
View File

@ -18,18 +18,20 @@ macro(CHECK_ENABLE_CXX_FLAG flag)
endmacro() endmacro()
macro(CHECK_ENABLE_DEBUG_CXX_FLAG flag) macro(CHECK_ENABLE_DEBUG_CXX_FLAG flag)
set(CMAKE_REQUIRED_QUIET TRUE) if(CMAKE_BUILD_TYPE STREQUAL "Debug")
check_cxx_compiler_flag("${flag}" CHECK_CXX_FLAG_DEBUG) set(CMAKE_REQUIRED_QUIET TRUE)
unset(CMAKE_REQUIRED_QUIET) check_cxx_compiler_flag("${flag}" CHECK_CXX_FLAG_DEBUG)
unset(CMAKE_REQUIRED_QUIET)
if(CHECK_CXX_FLAG_DEBUG) if(CHECK_CXX_FLAG_DEBUG)
message(STATUS "'${flag}': debug flag is supported.") message(STATUS "'${flag}': debug flag is supported.")
string(CONCAT _CMLIB_DETECTED_CXX_FLAGS_DEBUG "${_CMLIB_DETECTED_CXX_FLAGS_DEBUG} ${flag}") string(CONCAT _CMLIB_DETECTED_CXX_FLAGS_DEBUG "${_CMLIB_DETECTED_CXX_FLAGS_DEBUG} ${flag}")
else() else()
message(STATUS "'${flag}': debug flag is NOT supported.") message(STATUS "'${flag}': debug flag is NOT supported.")
endif()
# NOTE: check_cxx_compiler stores variables in the cache.
unset(CHECK_CXX_FLAG_DEBUG CACHE)
endif() endif()
# NOTE: check_cxx_compiler stores variables in the cache.
unset(CHECK_CXX_FLAG_DEBUG CACHE)
endmacro() endmacro()
function(cmlib_set_cxx_standard version) function(cmlib_set_cxx_standard version)

8
CMLibDocBreathe.cmake
View File

@ -68,9 +68,11 @@ function(add_breathe_target target)
${RST_FILES} ${WORK_DIR}) ${RST_FILES} ${WORK_DIR})
endif() endif()
endif() endif()
install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/breathe/ install(
COMPONENT doc OPTIONAL DIRECTORY ${CMAKE_BINARY_DIR}/doc/breathe/
DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/breathe) COMPONENT doc
OPTIONAL
DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/breathe)
else() else()
message(STATUS "CMLIB warning:") message(STATUS "CMLIB warning:")
add_custom_target(${target} VERBATIM COMMENT " Breathe is not found. Skipping target ${target} build") add_custom_target(${target} VERBATIM COMMENT " Breathe is not found. Skipping target ${target} build")

8
CMLibDocDoxygen.cmake
View File

@ -35,9 +35,11 @@ function(add_doxygen_target target)
COMMAND ${DOXYGEN_EXECUTABLE} ${work_dir}/Doxyfile COMMAND ${DOXYGEN_EXECUTABLE} ${work_dir}/Doxyfile
WORKING_DIRECTORY ${work_dir} WORKING_DIRECTORY ${work_dir}
COMMENT "Generating API documentation with Doxygen") COMMENT "Generating API documentation with Doxygen")
install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/doxygen/html/ install(
COMPONENT doc OPTIONAL DIRECTORY ${CMAKE_BINARY_DIR}/doc/doxygen/html/
DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/doxygen) COMPONENT doc
OPTIONAL
DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/doxygen)
else() else()
message(STATUS "CMLIB warning:") message(STATUS "CMLIB warning:")
add_custom_target(${target} VERBATIM COMMENT " Doxygen is not found. Skipping target ${target} build") add_custom_target(${target} VERBATIM COMMENT " Doxygen is not found. Skipping target ${target} build")

4
CMLibQtTranslation.cmake
View File

@ -11,7 +11,7 @@ function(qt5_translation outfiles)
set(_output_dir ${_QTTR_OUTPUT_DIR}) set(_output_dir ${_QTTR_OUTPUT_DIR})
set(_languages ${_QTTR_LANGUAGES}) set(_languages ${_QTTR_LANGUAGES})
set(_l10n_qrc_body "") set(L10N_QRC_BODY "")
make_directory(${_output_dir}) make_directory(${_output_dir})
foreach(lang ${_languages}) foreach(lang ${_languages})
@ -19,7 +19,7 @@ function(qt5_translation outfiles)
set(_qm "${_base_name}_${lang}.qm") set(_qm "${_base_name}_${lang}.qm")
list(APPEND _ts_list ${_output_dir}/${_ts}) list(APPEND _ts_list ${_output_dir}/${_ts})
list(APPEND _l10n_names_list "${_base_name}_l10n_${lang}") 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( add_custom_target(
${_base_name}_l10n_${lang} COMMAND ${Qt5_LUPDATE_EXECUTABLE} ${_sources} -ts ${_output_dir}/${_ts} ${_base_name}_l10n_${lang} COMMAND ${Qt5_LUPDATE_EXECUTABLE} ${_sources} -ts ${_output_dir}/${_ts}