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

CMake: Handle executables properly in server-mode

Browse Source 
Change-Id: Idabfc2449377d0d81cc1639ad4992d8710ec8b7d
Task-number: QTCREATORBUG-17359
Reviewed-by: Florian Apolloner <florian@apolloner.eu>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Tobias Hunger
2016-11-30 14:12:56 +01:00
parent c54fe23579
commit c9be75fe65
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/servermodereader.cpp
View File

@@ -191,7 +191,9 @@ QList<CMakeBuildTarget> ServerModeReader::buildTargets() const
ct.title = t->name; ct.title = t->name;
ct.executable = t->artifacts.isEmpty() ? FileName() : t->artifacts.at(0); ct.executable = t->artifacts.isEmpty() ? FileName() : t->artifacts.at(0);
TargetType type = UtilityType; TargetType type = UtilityType;
if (t->type == "STATIC_LIBRARY") if (t->type == "EXECUTABLE")
type = ExecutableType;
else if (t->type == "STATIC_LIBRARY")
type = StaticLibraryType; type = StaticLibraryType;
else if (t->type == "MODULE_LIBRARY" else if (t->type == "MODULE_LIBRARY"
|| t->type == "SHARED_LIBRARY" || t->type == "SHARED_LIBRARY"