summaryrefslogtreecommitdiff
path: root/src/plugins/autotoolsprojectmanager/makefileparser.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/autotoolsprojectmanager/makefileparser.cpp')
-rw-r--r--src/plugins/autotoolsprojectmanager/makefileparser.cpp23
1 files changed, 19 insertions, 4 deletions
diff --git a/src/plugins/autotoolsprojectmanager/makefileparser.cpp b/src/plugins/autotoolsprojectmanager/makefileparser.cpp
index 9c3e32216b..f56d58422a 100644
--- a/src/plugins/autotoolsprojectmanager/makefileparser.cpp
+++ b/src/plugins/autotoolsprojectmanager/makefileparser.cpp
@@ -291,12 +291,27 @@ void MakefileParser::parseSubDirs()
foreach (const QString& source, parser.sources())
m_sources.append(subDir + slash + source);
- // Duplicates might be possible in combination with several
- // "..._SUBDIRS" targets
- m_makefiles.removeDuplicates();
- m_sources.removeDuplicates();
+ // Append the include paths of the sub directory
+ m_includePaths.append(parser.includePaths());
+
+ // Append the flags of the sub directory
+ m_cflags.append(parser.cflags());
+ m_cxxflags.append(parser.cxxflags());
+
+ // Append the macros of the sub directory
+ foreach (const auto& m, parser.macros())
+ {
+ if (!m_macros.contains(m))
+ m_macros.append(m);
+ }
+
}
+ // Duplicates might be possible in combination with several
+ // "..._SUBDIRS" targets
+ m_makefiles.removeDuplicates();
+ m_sources.removeDuplicates();
+
if (subDirs.isEmpty())
m_success = false;
}