feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Do not process UtilityType build targets

Browse Source 
Those produce no direct artifacts, so there is no need to check those

Change-Id: Ic10720c1f3c3a7b602c45b870bfd39604754ddee
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Tobias Hunger
2016-08-17 12:45:04 +02:00
parent bda9bf6755
commit 53747b76dd
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -276,6 +276,9 @@ void CMakeProject::parseCMakeOutput()
QHash<QString, QStringList> targetDataCache; QHash<QString, QStringList> targetDataCache;
foreach (const CMakeBuildTarget &cbt, buildTargets()) { foreach (const CMakeBuildTarget &cbt, buildTargets()) {
if (cbt.targetType == UtilityType)
continue;
// CMake shuffles the include paths that it reports via the CodeBlocks generator // CMake shuffles the include paths that it reports via the CodeBlocks generator
// So remove the toolchain include paths, so that at least those end up in the correct // So remove the toolchain include paths, so that at least those end up in the correct
// place. // place.
@@ -697,7 +700,7 @@ void CMakeProject::updateApplicationAndDeploymentTargets()
DeploymentData deploymentData; DeploymentData deploymentData;
foreach (const CMakeBuildTarget &ct, buildTargets()) { foreach (const CMakeBuildTarget &ct, buildTargets()) {
if (ct.executable.isEmpty()) if (ct.targetType == UtilityType)
continue; continue;
if (ct.targetType == ExecutableType || ct.targetType == DynamicLibraryType) if (ct.targetType == ExecutableType || ct.targetType == DynamicLibraryType)