From dac2a188ded0dd2c07cd354fc00331c9603793d8 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 20 Jun 2017 12:13:25 +0200 Subject: [PATCH] CMake: Make sure no empty strings end up in deployment data Task-number: QTCREATORBUG-18406 Change-Id: I0b9f8ca76cee8ad2e9ae2ee1f124f16f473033d5 Reviewed-by: Eike Ziller Reviewed-by: Tim Jenssen --- src/plugins/cmakeprojectmanager/cmakeproject.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index 101649702cf..9ae83d71ad6 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -495,8 +495,13 @@ void CMakeProject::updateApplicationAndDeploymentTargets() if (ct.targetType == UtilityType) continue; - 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 || ct.targetType == DynamicLibraryType) { + if (!ct.executable.isEmpty()) { + 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('/');