Commit 2c5c1605 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh
Browse files

QmakeProject: Support absolute path for TARGET



Change-Id: I2b90e0581269b76e27edbe2f28dfda75bb4aa0e5
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent 7dc19b46
......@@ -1598,24 +1598,27 @@ QString QmakeProject::executableFor(const QmakeProFileNode *node)
return QString();
TargetInformation ti = node->targetInformation();
QString target;
switch (toolchain->targetAbi().os()) {
case ProjectExplorer::Abi::MacOS:
if (node->variableValue(ConfigVar).contains(QLatin1String("app_bundle")))
return QDir::cleanPath(destDirFor(ti) + QLatin1Char('/') + ti.target
+ QLatin1String(".app/Contents/MacOS/") + ti.target);
if (node->variableValue(ConfigVar).contains(QLatin1String("app_bundle"))) {
target = ti.target + QLatin1String(".app/Contents/MacOS/") + ti.target;
break;
}
// else fall through
case ProjectExplorer::Abi::WindowsOS:
case ProjectExplorer::Abi::LinuxOS:
case ProjectExplorer::Abi::BsdOS:
case ProjectExplorer::Abi::UnixOS: {
QString extension = node->singleVariableValue(TargetExtVar);
QString executable = QDir::cleanPath(destDirFor(ti) + QLatin1Char('/') + ti.target + extension);
return executable;
target = ti.target + extension;
break;
}
default:
return QString();
}
return QDir(destDirFor(ti)).absoluteFilePath(target);
}
void QmakeProject::emitBuildDirectoryInitialized()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment