From f702b7989215c1f718ed5cfa5a149ff6378c7237 Mon Sep 17 00:00:00 2001 From: Andreas Stallinger Date: Thu, 17 Sep 2015 11:31:00 +0200 Subject: [PATCH] src: fixed headersearchpaths, there where not inlcuded --- src/lib/Project.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/lib/Project.cpp b/src/lib/Project.cpp index fabe8427..7d64f09f 100644 --- a/src/lib/Project.cpp +++ b/src/lib/Project.cpp @@ -150,15 +150,16 @@ Parser::Arguments Project::getParserArguments() const // Add the include paths as HeaderSearchPaths as well, so clang will also look here when searching include files. utility::append(args.systemHeaderSearchPaths, m_fileManager.getIncludePaths()); - std::vector headerSearchPaths; + std::vector headerSearchSubPaths; for(FilePath p : projSettings->getHeaderSearchPaths()) { std::vector tempPaths = FileSystem::getSubDirectoies(p); - headerSearchPaths.insert( headerSearchPaths.end(), tempPaths.begin(), tempPaths.end() ); + headerSearchSubPaths.insert( headerSearchSubPaths.end(), tempPaths.begin(), tempPaths.end() ); } - - std::unique(headerSearchPaths.begin(),headerSearchPaths.end()); - utility::append(args.systemHeaderSearchPaths, headerSearchPaths); + + std::unique(headerSearchSubPaths.begin(),headerSearchSubPaths.end()); + utility::append(args.systemHeaderSearchPaths, headerSearchSubPaths); + utility::append(args.systemHeaderSearchPaths, projSettings->getHeaderSearchPaths()); utility::append(args.systemHeaderSearchPaths, appSettings->getHeaderSearchPaths()); utility::append(args.frameworkSearchPaths, projSettings->getFrameworkSearchPaths());