Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Schaefer2016-09-02 03:37:06 +0000
committerDoug Schaefer2016-09-02 03:37:06 +0000
commit57f9df203ed028a866b11284ae57e31689c7435f (patch)
treedcac8661af7582865c293b0f507cbdabebab5214
parent7b791be96d384bf4c26b00a3988c6eca6232f91d (diff)
downloadorg.eclipse.cdt-57f9df203ed028a866b11284ae57e31689c7435f.tar.gz
org.eclipse.cdt-57f9df203ed028a866b11284ae57e31689c7435f.tar.xz
org.eclipse.cdt-57f9df203ed028a866b11284ae57e31689c7435f.zip
Add more missing properties file. Mark CMake as Preview.
Also add missing since tag. Change-Id: I66638d862ea2879024bdbd22cf0e42a6f9250761
-rw-r--r--build/org.eclipse.cdt.cmake-feature/build.properties3
-rw-r--r--build/org.eclipse.cdt.cmake-feature/feature.properties2
-rw-r--r--core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java3
3 files changed, 6 insertions, 2 deletions
diff --git a/build/org.eclipse.cdt.cmake-feature/build.properties b/build/org.eclipse.cdt.cmake-feature/build.properties
index 64f93a9f0b7..b3a611b5c93 100644
--- a/build/org.eclipse.cdt.cmake-feature/build.properties
+++ b/build/org.eclipse.cdt.cmake-feature/build.properties
@@ -1 +1,2 @@
-bin.includes = feature.xml
+bin.includes = feature.xml,\
+ feature.properties
diff --git a/build/org.eclipse.cdt.cmake-feature/feature.properties b/build/org.eclipse.cdt.cmake-feature/feature.properties
index 3703525e4d7..6fd30b72dcc 100644
--- a/build/org.eclipse.cdt.cmake-feature/feature.properties
+++ b/build/org.eclipse.cdt.cmake-feature/feature.properties
@@ -12,7 +12,7 @@
# This file should be translated.
# "featureName" property - name of the feature
-featureName=C/C++ CMake Support
+featureName=C/C++ CMake Support - Preview
# "providerName" property - name of the company that provides the feature
providerName=Eclipse CDT
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java
index 28b5020222e..401899ae5b1 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java
@@ -195,6 +195,9 @@ public abstract class CBuildConfiguration extends PlatformObject
CCorePlugin.getDefault().getBuildEnvironmentManager().setEnvironment(env, config, true);
}
+ /**
+ * @since 6.1
+ */
@Override
public IBinary[] getBuildOutput() throws CoreException {
ICProject cproject = CoreModel.getDefault().create(config.getProject());

Back to the top