MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Gradle/C++: system header include directories importing fix for Gradle 4.8+ (CPP-12936)

Browse Source 
Since Gradle 4.8, system header include directories of the native compile task should be accessed separately via the systemIncludes property.
https://github.com/gradle/gradle-native/blob/master/docs/RELEASE-NOTES.md#better-control-over-system-include-path-for-native-compilation---583
This commit is contained in:
Vladislav.Soroka
2018-07-16 13:08:01 +03:00
parent 7d8a62a44a
commit 23bb967a53
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/native/tooling/src/builder/CppModelBuilder.java
+17 -4
View File
@@ -57,6 +57,9 @@ import java.util.*;
* @author Vladislav.Soroka
*/
public class CppModelBuilder implements ModelBuilderService {
private static final boolean IS_48_OR_BETTER = GradleVersion.current().getBaseVersion().compareTo(GradleVersion.version("4.8")) >= 0;
private static final boolean IS_47_OR_BETTER = IS_48_OR_BETTER ||
GradleVersion.current().getBaseVersion().compareTo(GradleVersion.version("4.7")) >= 0;
@Override
public boolean canBuild(String modelName) {
@@ -87,7 +90,7 @@ public class CppModelBuilder implements ModelBuilderService {
}
List<String> compilerArgs = new ArrayList<String>();
Set<File> compileIncludePath = cppBinary.getCompileIncludePath().getFiles();
Set<File> compileIncludePath = new LinkedHashSet<File>(cppBinary.getCompileIncludePath().getFiles());
Map<File, CppFileSettings> sources = new HashMap<File, CppFileSettings>();
for (File file : cppBinary.getCppSource().getFiles()) {
@@ -103,7 +106,17 @@ public class CppModelBuilder implements ModelBuilderService {
CppCompile cppCompile = compileTask.get();
compileTaskName = cppCompile.getPath();
compilerArgs.addAll(cppCompile.getCompilerArgs().getOrElse(Collections.<String>emptyList()));
systemIncludes.addAll(cppCompile.getIncludes().getFiles());
//Since Gradle 4.8, system header include directories should be accessed separately via the systemIncludes property
//see https://github.com/gradle/gradle-native/blob/master/docs/RELEASE-NOTES.md#better-control-over-system-include-path-for-native-compilation---583
if (IS_48_OR_BETTER) {
compileIncludePath.addAll(cppCompile.getIncludes().getFiles());
systemIncludes.addAll(cppCompile.getSystemIncludes().getFiles());
}
else {
systemIncludes.addAll(cppCompile.getIncludes().getFiles());
}
appendFileSettings(sources, project, cppBinary, cppCompile);
}
@@ -196,7 +209,7 @@ public class CppModelBuilder implements ModelBuilderService {
private static File getExecutableFile(LinkExecutable linkExecutable) {
File executableFile;
RegularFileProperty binaryFile = null;
if (GradleVersion.current().compareTo(GradleVersion.version("4.7")) >= 0) {
if (IS_47_OR_BETTER) {
binaryFile = linkExecutable.getLinkedFile();
}
else {
@@ -292,7 +305,7 @@ public class CppModelBuilder implements ModelBuilderService {
}
}
if (GradleVersion.current().getBaseVersion().compareTo(GradleVersion.version("4.6")) <= 0) {
if (!IS_47_OR_BETTER) {
project.getLogger().error(
"[sync error] Unable to resolve compiler executable. " +
"The project uses '" + GradleVersion.current() + "' try to update the gradle version");