From 4e6fd0a2c071f918ad5fbef812157622516f4e22 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Fri, 5 May 2017 14:02:05 +0200
Subject: [PATCH] CMake: Improve handling of CMAKE_RUNTIME_OUTPUT_DIRECTORY

Set the working directory of binaries which got moved from the
build directory using CMAKE_RUNTIME_OUTPUT_DIRECTORY to the directory
the binay is actualy in.

Task-number: QTCREATORBUG-18158
Change-Id: I059d55a6c408799f3220bd90c271a6d743e6cd82
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 src/plugins/cmakeprojectmanager/servermodereader.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/plugins/cmakeprojectmanager/servermodereader.cpp b/src/plugins/cmakeprojectmanager/servermodereader.cpp
index 874c8f4f74c..b2cf1517c6b 100644
--- a/src/plugins/cmakeprojectmanager/servermodereader.cpp
+++ b/src/plugins/cmakeprojectmanager/servermodereader.cpp
@@ -204,7 +204,11 @@ QList<CMakeBuildTarget> ServerModeReader::buildTargets() const
         else
             type = UtilityType;
         ct.targetType = type;
-        ct.workingDirectory = t->buildDirectory;
+        if (t->artifacts.isEmpty()) {
+            ct.workingDirectory = t->buildDirectory;
+        } else {
+            ct.workingDirectory = Utils::FileName::fromString(t->artifacts.at(0).toFileInfo().absolutePath());
+        }
         ct.sourceDirectory = t->sourceDirectory;
         return ct;
     });