mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 06:02:11 +02:00
Code Issues Wiki Activity

Fix up leftover toolchain provider id usage.

Browse source 
The CMake toolchain file editor was not recording the correct
toolchain. The same was also true for the toolchain selection in
the build settings tab.

Change-Id: I62e4c7ae0175da7c1b5ffb7f89e321a371a6e8e0
This commit is contained in:
Doug Schaefer 2017-11-15 13:46:00 -05:00
parent f2ab40d9f2
commit 589faf51cc
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/NewCMakeToolChainFilePage.java
View file

@ -109,7 +109,7 @@ public class NewCMakeToolChainFilePage extends WizardPage {
ICMakeToolChainFile file = manager.newToolChainFile(Paths.get(pathText.getText())); ICMakeToolChainFile file = manager.newToolChainFile(Paths.get(pathText.getText()));
IToolChain tc = toolchains[tcCombo.getSelectionIndex()]; IToolChain tc = toolchains[tcCombo.getSelectionIndex()];
file.setProperty(CMakeBuildConfiguration.TOOLCHAIN_TYPE, tc.getProvider().getId()); file.setProperty(CMakeBuildConfiguration.TOOLCHAIN_TYPE, tc.getTypeId());
file.setProperty(CMakeBuildConfiguration.TOOLCHAIN_ID, tc.getId()); file.setProperty(CMakeBuildConfiguration.TOOLCHAIN_ID, tc.getId());
return file; return file;

2
launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/corebuild/CommonBuildTab.java
View file

@ -167,7 +167,7 @@ public abstract class CommonBuildTab extends AbstractLaunchConfigurationTab {
} else { } else {
IToolChain tc = toolchains[i - 1]; IToolChain tc = toolchains[i - 1];
configuration.setAttribute(ICBuildConfiguration.TOOLCHAIN_ID, tc.getId()); configuration.setAttribute(ICBuildConfiguration.TOOLCHAIN_ID, tc.getId());
configuration.setAttribute(ICBuildConfiguration.TOOLCHAIN_TYPE, tc.getProvider().getId()); configuration.setAttribute(ICBuildConfiguration.TOOLCHAIN_TYPE, tc.getTypeId());
} }
} }