From f512c6d5d2612e3b6e9f80264dfd3811fc10cb9b Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Mon, 21 Jun 2021 12:57:25 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=A0=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80?= =?UTF-8?q?=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D0=BE=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- qrc/l10n.qrc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qrc/l10n.qrc.in b/qrc/l10n.qrc.in index 3513d13..da14158 100644 --- a/qrc/l10n.qrc.in +++ b/qrc/l10n.qrc.in @@ -1,5 +1,5 @@ - @L10N_QRC_BODY@ + @l10n_qrc_body@ From baa57922b4dd9b6c27c01dedb316c8c2df8a906e Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Mon, 21 Jun 2021 13:00:11 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=98=D0=BC=D1=8F=20=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D0=BE=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMLibQtTranslation.cmake | 4 ++-- qrc/l10n.qrc.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMLibQtTranslation.cmake b/CMLibQtTranslation.cmake index 23260a9..a69c799 100644 --- a/CMLibQtTranslation.cmake +++ b/CMLibQtTranslation.cmake @@ -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 "${CMAKE_BINARY_DIR}/${_qm}\n") + string(APPEND L10N_QRC_BODY "${CMAKE_BINARY_DIR}/${_qm}\n") add_custom_target( ${_base_name}_l10n_${lang} COMMAND ${Qt5_LUPDATE_EXECUTABLE} ${_sources} -ts ${_output_dir}/${_ts} diff --git a/qrc/l10n.qrc.in b/qrc/l10n.qrc.in index da14158..3513d13 100644 --- a/qrc/l10n.qrc.in +++ b/qrc/l10n.qrc.in @@ -1,5 +1,5 @@ - @l10n_qrc_body@ + @L10N_QRC_BODY@ From 7a6c8e4a30664b6310749de62a6dadbd6bce9da8 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Thu, 24 Jun 2021 10:38:45 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?= =?UTF-8?q?=D0=B0=20=D1=84=D0=BB=D0=B0=D0=B3=D0=BE=D0=B2=20=D1=82=D0=BE?= =?UTF-8?q?=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=B2=20=D0=BE=D1=82=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BE=D1=87=D0=BD=D0=BE=D0=BC=20=D1=80=D0=B5=D0=B6=D0=B8?= =?UTF-8?q?=D0=BC=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMLibCompilerFlags.cmake | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/CMLibCompilerFlags.cmake b/CMLibCompilerFlags.cmake index 9023444..d500308 100644 --- a/CMLibCompilerFlags.cmake +++ b/CMLibCompilerFlags.cmake @@ -18,18 +18,20 @@ macro(CHECK_ENABLE_CXX_FLAG flag) 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(CMAKE_BUILD_TYPE STREQUAL "Debug") + 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.") + 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) endif() - # NOTE: check_cxx_compiler stores variables in the cache. - unset(CHECK_CXX_FLAG_DEBUG CACHE) endmacro() function(cmlib_set_cxx_standard version) From ffa62626701c20ac850346590a5aa94c9e40db81 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Thu, 24 Jun 2021 10:39:06 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D0=A4=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMLibDocBreathe.cmake | 8 +++++--- CMLibDocDoxygen.cmake | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CMLibDocBreathe.cmake b/CMLibDocBreathe.cmake index 243e21d..ea2cf48 100644 --- a/CMLibDocBreathe.cmake +++ b/CMLibDocBreathe.cmake @@ -68,9 +68,11 @@ function(add_breathe_target target) ${RST_FILES} ${WORK_DIR}) endif() endif() - install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/breathe/ - COMPONENT doc OPTIONAL - DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/breathe) + install( + DIRECTORY ${CMAKE_BINARY_DIR}/doc/breathe/ + COMPONENT doc + OPTIONAL + DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/breathe) else() message(STATUS "CMLIB warning:") add_custom_target(${target} VERBATIM COMMENT " Breathe is not found. Skipping target ${target} build") diff --git a/CMLibDocDoxygen.cmake b/CMLibDocDoxygen.cmake index a1e2399..2d86e04 100644 --- a/CMLibDocDoxygen.cmake +++ b/CMLibDocDoxygen.cmake @@ -35,9 +35,11 @@ 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 - DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/doxygen) + install( + DIRECTORY ${CMAKE_BINARY_DIR}/doc/doxygen/html/ + COMPONENT doc + OPTIONAL + DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/doxygen) else() message(STATUS "CMLIB warning:") add_custom_target(${target} VERBATIM COMMENT " Doxygen is not found. Skipping target ${target} build")