From 411678048daf045648fbecf4f9e1eff2d0c5c20f Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 23 May 2019 15:26:40 +0200 Subject: CMake: Set the correct build system target to the project part The internal build target key had changed again. Adapt and use a more error proof pattern to be hopefully safe if it may change again. The wrong build target key led inside the AutoTest plugin to a wrong comparison of build target of the project parts vs. the build target of the run configuration which in turn ended up in always deducing the run configuration for the test runner. Change-Id: I32df578df85cc0206c2b8fdac00acc3a798f0d73 Reviewed-by: hjk --- src/plugins/cmakeprojectmanager/servermodereader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/cmakeprojectmanager/servermodereader.cpp') diff --git a/src/plugins/cmakeprojectmanager/servermodereader.cpp b/src/plugins/cmakeprojectmanager/servermodereader.cpp index e63243f887..dba909b478 100644 --- a/src/plugins/cmakeprojectmanager/servermodereader.cpp +++ b/src/plugins/cmakeprojectmanager/servermodereader.cpp @@ -382,7 +382,7 @@ CppTools::RawProjectParts ServerModeReader::createRawProjectParts() const CppTools::RawProjectPart rpp; rpp.setProjectFileLocation(fg->target->sourceDirectory.toString() + "/CMakeLists.txt"); - rpp.setBuildSystemTarget(fg->target->name + QChar('\n') + fg->target->sourceDirectory.toString() + QChar('/')); + rpp.setBuildSystemTarget(CMakeTargetNode::generateId(fg->target->sourceDirectory, fg->target->name)); rpp.setDisplayName(fg->target->name + QString::number(counter)); rpp.setMacros(fg->macros); rpp.setIncludePaths(includes); -- cgit v1.2.1