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

Compare commits

base: f1x1t:57173313ad42dd77a6bbc7312a0f43098c2c4f40
Branches Tags
f1x1t:master
...
compare: f1x1t:4768c5efc7ce3ca9fc80baf72df303e91f348a96
Branches Tags
f1x1t:master

2 Commits
57173313ad ... 4768c5efc7

Author SHA1 Message Date
Andrey Astafyev
4768c5efc7 Исправлена функция для внедрения переводов 2020-04-13 20:55:36 +03:00
Andrey Astafyev
450c0200a7 Исключение файлов, сгенерированных из qrc, из unity сборки 2020-04-13 20:53:01 +03:00
2 changed files with 15 additions and 7 deletions
Show Stats Expand all files Collapse all files

9
CMLibCommonTargetProperties.cmake
View File

@ -7,6 +7,15 @@ function(common_target_properties target)
set(__interface 1) set(__interface 1)
set(__visibility INTERFACE) set(__visibility INTERFACE)
endif() endif()
get_target_property(__sources ${target} SOURCES)
foreach(__src IN LISTS __sources)
string(REGEX MATCH ".*/qrc_.*\\.cpp$" __qrc ${__src})
if (__qrc)
set_property(SOURCE ${__qrc} PROPERTY COTIRE_EXCLUDED ON)
endif()
endforeach()
target_compile_features(${target} ${__visibility} ${COMMON_CXX_FEATURES}) target_compile_features(${target} ${__visibility} ${COMMON_CXX_FEATURES})
get_target_property(_targetType ${target} TYPE) get_target_property(_targetType ${target} TYPE)
if(_targetType STREQUAL "EXECUTABLE" AND CMAKE_CXX_COMPILE_OPTIONS_PIE) if(_targetType STREQUAL "EXECUTABLE" AND CMAKE_CXX_COMPILE_OPTIONS_PIE)

9
CMLibQtTranslation.cmake
View File

@ -37,14 +37,13 @@ function(qt5_translation outfiles)
endforeach() endforeach()
configure_file(${CMLIB_MODULE_DIR}/qrc/l10n.qrc.in ${CMAKE_BINARY_DIR}/${_base_name}_l10n.qrc) configure_file(${CMLIB_MODULE_DIR}/qrc/l10n.qrc.in ${CMAKE_BINARY_DIR}/${_base_name}_l10n.qrc)
# qt5_add_resources(_qrc ${CMAKE_BINARY_DIR}/${_base_name}_l10n.qrc) qt5_add_resources(${outfiles} ${CMAKE_BINARY_DIR}/${_base_name}_l10n.qrc)
list(APPEND ${outfiles} ${CMAKE_BINARY_DIR}/${_base_name}_l10n.qrc) add_custom_target(${_base_name}_qrc DEPENDS ${_qrc})
# add_custom_target(${_base_name}_qrc DEPENDS ${_qrc}) add_custom_target(${_base_name}_l10n DEPENDS ${_l10n_targets})
# add_custom_target(${_base_name}_l10n DEPENDS ${_l10n_targets})
if(NOT TARGET l10n) if(NOT TARGET l10n)
add_custom_target(l10n) add_custom_target(l10n)
endif() endif()
add_dependencies(l10n ${_target}_l10n) add_dependencies(l10n ${_base_name}_l10n)
# add_dependencies(${_target} ${_target}_qrc) # add_dependencies(${_target} ${_target}_qrc)
# target_sources(${_target} PUBLIC ${_qrc}) # target_sources(${_target} PUBLIC ${_qrc})