diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-06-20 11:30:21 +0300 |
---|---|---|
committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-06-20 11:32:02 +0300 |
commit | 687466ac4748c82d8a56aff3f2f5901f929a4bcd (patch) | |
tree | 426992ddc3e43b5d5522a781065287beaee5e0a0 /src/plugins/cmakeprojectmanager/cmakeproject.cpp | |
parent | f047e1a2a2ac6667d7d19c95e3f6bb96e17f2a5a (diff) | |
parent | b89888ca9d6d10c850619c726e38584ca6637578 (diff) |
Merge remote-tracking branch 'origin/4.3'
Change-Id: I126f3a05212a3d5df78812e66285bc9e8078360b
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakeproject.cpp')
-rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeproject.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index ce4c54a9fe..101649702c 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -498,8 +498,10 @@ void CMakeProject::updateApplicationAndDeploymentTargets() if (ct.targetType == ExecutableType || ct.targetType == DynamicLibraryType) deploymentData.addFile(ct.executable.toString(), deploymentPrefix + buildDir.relativeFilePath(ct.executable.toFileInfo().dir().path()), DeployableFile::TypeExecutable); if (ct.targetType == ExecutableType) { + FileName srcWithTrailingSlash = FileName::fromString(ct.sourceDirectory.toString()); + srcWithTrailingSlash.appendString('/'); // TODO: Put a path to corresponding .cbp file into projectFilePath? - appTargetList.list << BuildTargetInfo(ct.title, ct.executable, ct.executable); + appTargetList.list << BuildTargetInfo(ct.title, ct.executable, srcWithTrailingSlash); } } |