diff options
author | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-08-07 15:21:20 +0200 |
---|---|---|
committer | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-08-08 14:07:13 +0000 |
commit | 62e776aa8ed54bf448e355a55cf4f0e6c4579877 (patch) | |
tree | 69cda5d86bbc9ef9a68b0284684a55adea6519b7 /src/plugins/cpptools | |
parent | 44b931f7f5bfc1ccdfb456300f13297d88397298 (diff) | |
download | qt-creator-62e776aa8ed54bf448e355a55cf4f0e6c4579877.tar.gz |
Clang: Provide include directory only for libclang
Only libclang has issues with the include directory
search therefore undefining include folders makes sense
only for libclang options builder.
Change-Id: Ie3f62f5f3a89503e6e0ab59e18889e92425c3abc
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Diffstat (limited to 'src/plugins/cpptools')
-rw-r--r-- | src/plugins/cpptools/compileroptionsbuilder.cpp | 30 | ||||
-rw-r--r-- | src/plugins/cpptools/compileroptionsbuilder.h | 7 |
2 files changed, 2 insertions, 35 deletions
diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp index 0eb940dcca..5e5721dc7c 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.cpp +++ b/src/plugins/cpptools/compileroptionsbuilder.cpp @@ -39,14 +39,8 @@ namespace CppTools { -static constexpr char SYSTEM_INCLUDE_PREFIX[] = "-isystem"; - -CompilerOptionsBuilder::CompilerOptionsBuilder(const ProjectPart &projectPart, - const QString &clangVersion, - const QString &clangResourceDirectory) +CompilerOptionsBuilder::CompilerOptionsBuilder(const ProjectPart &projectPart) : m_projectPart(projectPart) - , m_clangVersion(clangVersion) - , m_clangResourceDirectory(clangResourceDirectory) { } @@ -500,31 +494,9 @@ bool CompilerOptionsBuilder::excludeHeaderPath(const QString &headerPath) const void CompilerOptionsBuilder::addPredefinedHeaderPathsOptions() { - add("-nostdinc"); - add("-nostdlibinc"); - // In case of MSVC we need builtin clang defines to correctly handle clang includes if (m_projectPart.toolchainType != ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID) add("-undef"); - - addClangIncludeFolder(); -} - -static QString clangIncludeDirectory(const QString &clangVersion, - const QString &clangResourceDirectory) -{ -#ifndef UNIT_TESTS - return Core::ICore::clangIncludeDirectory(clangVersion, clangResourceDirectory); -#else - return QString(); -#endif -} - -void CompilerOptionsBuilder::addClangIncludeFolder() -{ - QTC_CHECK(!m_clangVersion.isEmpty()); - add(SYSTEM_INCLUDE_PREFIX); - add(clangIncludeDirectory(m_clangVersion, m_clangResourceDirectory)); } void CompilerOptionsBuilder::addProjectConfigFileInclude() diff --git a/src/plugins/cpptools/compileroptionsbuilder.h b/src/plugins/cpptools/compileroptionsbuilder.h index 35cd2ce57a..33a72820e4 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.h +++ b/src/plugins/cpptools/compileroptionsbuilder.h @@ -39,9 +39,7 @@ public: Use }; - CompilerOptionsBuilder(const ProjectPart &projectPart, - const QString &clangVersion = QString(), - const QString &clangResourceDirectory = QString()); + CompilerOptionsBuilder(const ProjectPart &projectPart); virtual ~CompilerOptionsBuilder() {} virtual void addTargetTriple(); @@ -90,11 +88,8 @@ private: QByteArray macroOption(const ProjectExplorer::Macro ¯o) const; QByteArray toDefineOption(const ProjectExplorer::Macro ¯o) const; QString defineDirectiveToDefineOption(const ProjectExplorer::Macro &marco) const; - void addClangIncludeFolder(); QStringList m_options; - QString m_clangVersion; - QString m_clangResourceDirectory; }; } // namespace CppTools |