diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-06-27 10:22:29 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-06-27 10:33:44 +0200 |
| commit | c7b724c4caa78383640d6f66a95b144d91ecb40a (patch) | |
| tree | efee89d2737dcd65d40468d35b16c66710d72b8f /cmake | |
| parent | c456572fa57295d90147408c61a1209c96a43791 (diff) | |
| parent | 06715441d695064e0548fa94d0cc3e325a3870a6 (diff) | |
| download | qt-creator-c7b724c4caa78383640d6f66a95b144d91ecb40a.tar.gz | |
Merge remote-tracking branch 'origin/8.0'
Change-Id: Ia1c97d5949de607177a5a0632c7e8a37cbfd3475
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtCreatorAPI.cmake | 2 | ||||
| -rw-r--r-- | cmake/QtCreatorTranslations.cmake | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index f6d6a83a46..1d04c38b54 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -832,7 +832,7 @@ function(add_qtc_test name) endif() foreach(dependency ${_arg_DEPENDS}) - if (NOT TARGET ${dependency} AND NOT _arg_GTEST) + if (NOT TARGET ${dependency}) if (WITH_DEBUG_CMAKE) message(STATUS "'${dependency}' is not a target") endif() diff --git a/cmake/QtCreatorTranslations.cmake b/cmake/QtCreatorTranslations.cmake index a9da1e5247..2e9c564b8f 100644 --- a/cmake/QtCreatorTranslations.cmake +++ b/cmake/QtCreatorTranslations.cmake @@ -27,6 +27,7 @@ function(_extract_ts_data_from_targets outprefix) set(_target_sources "") if(_source_files) + list(FILTER _source_files EXCLUDE REGEX ".*[.]json[.]in|.*[.]svg") list(APPEND _target_sources ${_source_files}) endif() if(_extra_translations) |