diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-10-21 09:31:01 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-10-21 09:31:01 +0200 |
| commit | dbb62016052ad70e8e3dffb60a419504c9eb6dac (patch) | |
| tree | 7926ab117c9932be15b8886ba5230048da97bc07 /cmake/QtCreatorAPIInternal.cmake | |
| parent | 526579b09d1be00ef2f0e371e0c57064777e6538 (diff) | |
| parent | cc6f35016ab6f7a1ce82a39582141ab8a35b7bce (diff) | |
Merge remote-tracking branch 'origin/4.14' into master
Change-Id: Id7ad82997873da828456a15c441620d93c6fc7e7
Diffstat (limited to 'cmake/QtCreatorAPIInternal.cmake')
| -rw-r--r-- | cmake/QtCreatorAPIInternal.cmake | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/cmake/QtCreatorAPIInternal.cmake b/cmake/QtCreatorAPIInternal.cmake index 5404680da0..8e55d4e8a1 100644 --- a/cmake/QtCreatorAPIInternal.cmake +++ b/cmake/QtCreatorAPIInternal.cmake @@ -386,7 +386,7 @@ endfunction() function(extend_qtc_target target_name) cmake_parse_arguments(_arg "" - "SOURCES_PREFIX;FEATURE_INFO" + "SOURCES_PREFIX;SOURCES_PREFIX_FROM_TARGET;FEATURE_INFO" "CONDITION;DEPENDS;PUBLIC_DEPENDS;DEFINES;PUBLIC_DEFINES;INCLUDES;PUBLIC_INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;EXTRA_TRANSLATIONS;PROPERTIES" ${ARGN} ) @@ -411,6 +411,14 @@ function(extend_qtc_target target_name) return() endif() + if (_arg_SOURCES_PREFIX_FROM_TARGET) + if (NOT TARGET ${_arg_SOURCES_PREFIX_FROM_TARGET}) + return() + else() + get_target_property(_arg_SOURCES_PREFIX ${_arg_SOURCES_PREFIX_FROM_TARGET} SOURCES_DIR) + endif() + endif() + add_qtc_depends(${target_name} PRIVATE ${_arg_DEPENDS} PUBLIC ${_arg_PUBLIC_DEPENDS} |