feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Autotools: Also read _HEADERS variable

Browse Source 
Change-Id: If081d9ec00a87d8e7989720a351531e94d02e28c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-09-24 08:28:28 +02:00
parent 323f353c6c
commit 35bab3a021
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/autotoolsprojectmanager/makefileparser.cpp
View File

@@ -154,7 +154,7 @@ MakefileParser::TopTarget MakefileParser::topTarget() const
return BuiltSources; return BuiltSources;
if (id == QLatin1String("SUBDIRS") || id == QLatin1String("DIST_SUBDIRS")) if (id == QLatin1String("SUBDIRS") || id == QLatin1String("DIST_SUBDIRS"))
return SubDirs; return SubDirs;
if (id.endsWith(QLatin1String("_SOURCES"))) if (id.endsWith("_SOURCES") || id.endsWith("_HEADERS"))
return Sources; return Sources;
return Undefined; return Undefined;
@@ -174,7 +174,7 @@ void MakefileParser::parseBinPrograms()
void MakefileParser::parseSources() void MakefileParser::parseSources()
{ {
QTC_ASSERT(m_line.contains(QLatin1String("_SOURCES")), return); QTC_ASSERT(m_line.contains("_SOURCES") || m_line.contains("_HEADERS"), return);
bool hasVariables = false; bool hasVariables = false;
m_sources.append(targetValues(&hasVariables)); m_sources.append(targetValues(&hasVariables));

2
tests/manual/autotoolsprojectmanager/Makefile.am
View File

@@ -1,7 +1,7 @@
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
lib_LTLIBRARIES = libfoo.la lib_LTLIBRARIES = libfoo.la
libfoo_la_SOURCES = foo.c libfoo_la_SOURCES = foo.c foo.h
bin_PROGRAMS = main bin_PROGRAMS = main
main_SOURCES = main.c main_SOURCES = main.c