mirror of
https://github.com/arduino/Arduino.git
synced 2025-02-18 12:54:25 +01:00
If 2 libs have same .h file, use the lib with same dir name
This commit is contained in:
parent
5dfafe7847
commit
ef4f0f3bc9
@ -1245,6 +1245,13 @@ public class Base {
|
||||
String packages[] =
|
||||
Compiler.headerListFromIncludePath(subfolder.getAbsolutePath());
|
||||
for (String pkg : packages) {
|
||||
File old = importToLibraryTable.get(pkg);
|
||||
if (old != null) {
|
||||
// If a library was already found with this header, keep it if
|
||||
// the library's directory name matches the header name.
|
||||
String name = pkg.substring(0, pkg.length() - 2);
|
||||
if (old.getPath().endsWith(name)) continue;
|
||||
}
|
||||
importToLibraryTable.put(pkg, subfolder);
|
||||
}
|
||||
} catch (IOException e) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user