mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-22 14:12:10 +02:00
Merge from cdt_40.
This commit is contained in:
parent
e8019df504
commit
5a24329e7c
1 changed files with 11 additions and 6 deletions
|
@ -290,12 +290,17 @@ public class CMainTab extends CLaunchConfigurationTab {
|
||||||
if (cProject != null)
|
if (cProject != null)
|
||||||
{
|
{
|
||||||
config.setMappedResources(new IResource[] { cProject.getProject() });
|
config.setMappedResources(new IResource[] { cProject.getProject() });
|
||||||
ICProjectDescription projDes = CCorePlugin.getDefault().getProjectDescription(cProject.getProject());
|
try { // Only initialize the build config ID once.
|
||||||
if (projDes != null)
|
if (config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_BUILD_CONFIG_ID, "").length() == 0)//$NON-NLS-1$
|
||||||
{
|
{
|
||||||
String buildConfigID = projDes.getActiveConfiguration().getId();
|
ICProjectDescription projDes = CCorePlugin.getDefault().getProjectDescription(cProject.getProject());
|
||||||
config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_BUILD_CONFIG_ID, buildConfigID);
|
if (projDes != null)
|
||||||
}
|
{
|
||||||
|
String buildConfigID = projDes.getActiveConfiguration().getId();
|
||||||
|
config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_BUILD_CONFIG_ID, buildConfigID);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (CoreException e) { e.printStackTrace(); }
|
||||||
}
|
}
|
||||||
config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, fProjText.getText());
|
config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, fProjText.getText());
|
||||||
config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, fProgText.getText());
|
config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, fProgText.getText());
|
||||||
|
|
Loading…
Add table
Reference in a new issue