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

CppTools: Split CppTools::UseBuiltin in two options

Browse Source 
...for clarity.

No behavior change.

Change-Id: Id0334bc79b97a8ff53b37089e337530c9a01b1d4
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Nikolai Kosjar
2018-11-30 12:15:07 +01:00
parent e57c1268ee
commit c7c800a73e
5 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/clangcodemodel/clangutils.cpp
View File

@@ -69,7 +69,8 @@ public:
LibClangOptionsBuilder(const ProjectPart &projectPart) LibClangOptionsBuilder(const ProjectPart &projectPart)
: CompilerOptionsBuilder(projectPart, : CompilerOptionsBuilder(projectPart,
UseSystemHeader::No, UseSystemHeader::No,
UseBuiltin::Yes, UseToolchainMacros::Yes,
UseTweakedHeaderPaths::Yes,
UseLanguageDefines::No, UseLanguageDefines::No,
QString(CLANG_VERSION), QString(CLANG_VERSION),
QString(CLANG_RESOURCE_DIR)) QString(CLANG_RESOURCE_DIR))
@@ -336,7 +337,10 @@ void generateCompilationDB(::Utils::FileName projectDir, CppTools::ProjectInfo p
for (ProjectPart::Ptr projectPart : projectInfo.projectParts()) { for (ProjectPart::Ptr projectPart : projectInfo.projectParts()) {
const ::Utils::FileName buildDir = buildDirectory(*projectPart); const ::Utils::FileName buildDir = buildDirectory(*projectPart);
CompilerOptionsBuilder optionsBuilder(*projectPart, UseSystemHeader::No, UseBuiltin::No); CompilerOptionsBuilder optionsBuilder(*projectPart,
UseSystemHeader::No,
UseToolchainMacros::No,
UseTweakedHeaderPaths::No);
optionsBuilder.build(CppTools::ProjectFile::Unclassified, optionsBuilder.build(CppTools::ProjectFile::Unclassified,
CppTools::UsePrecompiledHeaders::No); CppTools::UsePrecompiledHeaders::No);

3
src/plugins/clangtools/clangtoolruncontrol.cpp
View File

@@ -193,7 +193,8 @@ static AnalyzeUnits toAnalyzeUnits(const FileInfos &fileInfos)
for (const FileInfo &fileInfo : fileInfos) { for (const FileInfo &fileInfo : fileInfos) {
CompilerOptionsBuilder optionsBuilder(*fileInfo.projectPart, CompilerOptionsBuilder optionsBuilder(*fileInfo.projectPart,
UseSystemHeader::No, UseSystemHeader::No,
UseBuiltin::Yes, UseToolchainMacros::Yes,
UseTweakedHeaderPaths::Yes,
UseLanguageDefines::No, UseLanguageDefines::No,
QString(CLANG_VERSION), QString(CLANG_VERSION),
QString(CLANG_RESOURCE_DIR)); QString(CLANG_RESOURCE_DIR));

14
src/plugins/cpptools/compileroptionsbuilder.cpp
View File

@@ -73,13 +73,15 @@ static QString defineDirectiveToDefineOption(const ProjectExplorer::Macro &macro
CompilerOptionsBuilder::CompilerOptionsBuilder(const ProjectPart &projectPart, CompilerOptionsBuilder::CompilerOptionsBuilder(const ProjectPart &projectPart,
UseSystemHeader useSystemHeader, UseSystemHeader useSystemHeader,
UseBuiltin useBuiltInHeaderPathsAndDefines, UseToolchainMacros useToolchainMacros,
UseTweakedHeaderPaths useTweakedHeaderPaths,
UseLanguageDefines useLanguageDefines, UseLanguageDefines useLanguageDefines,
const QString &clangVersion, const QString &clangVersion,
const QString &clangResourceDirectory) const QString &clangResourceDirectory)
: m_projectPart(projectPart) : m_projectPart(projectPart)
, m_useSystemHeader(useSystemHeader) , m_useSystemHeader(useSystemHeader)
, m_useBuiltInHeaderPathsAndDefines(useBuiltInHeaderPathsAndDefines) , m_useToolchainMacros(useToolchainMacros)
, m_useTweakedHeaderPaths(useTweakedHeaderPaths)
, m_useLanguageDefines(useLanguageDefines) , m_useLanguageDefines(useLanguageDefines)
, m_clangVersion(clangVersion) , m_clangVersion(clangVersion)
, m_clangResourceDirectory(clangResourceDirectory) , m_clangResourceDirectory(clangResourceDirectory)
@@ -279,7 +281,7 @@ static int includeIndexForResourceDirectory(const QStringList &options, bool isM
void CompilerOptionsBuilder::insertWrappedQtHeaders() void CompilerOptionsBuilder::insertWrappedQtHeaders()
{ {
if (m_useBuiltInHeaderPathsAndDefines == UseBuiltin::No) if (m_useTweakedHeaderPaths == UseTweakedHeaderPaths::No)
return; return;
QStringList wrappedQtHeaders; QStringList wrappedQtHeaders;
@@ -343,7 +345,7 @@ void CompilerOptionsBuilder::addHeaderPathOptions()
m_options.append(includes); m_options.append(includes);
m_options.append(systemIncludes); m_options.append(systemIncludes);
if (m_useBuiltInHeaderPathsAndDefines == UseBuiltin::No) if (m_useTweakedHeaderPaths == UseTweakedHeaderPaths::No)
return; return;
// Exclude all built-in includes except Clang resource directory. // Exclude all built-in includes except Clang resource directory.
@@ -391,7 +393,7 @@ void CompilerOptionsBuilder::addPrecompiledHeaderOptions(UsePrecompiledHeaders u
void CompilerOptionsBuilder::addToolchainAndProjectMacros() void CompilerOptionsBuilder::addToolchainAndProjectMacros()
{ {
if (m_useBuiltInHeaderPathsAndDefines == UseBuiltin::Yes) if (m_useToolchainMacros == UseToolchainMacros::Yes)
addMacros(m_projectPart.toolChainMacros); addMacros(m_projectPart.toolChainMacros);
addMacros(m_projectPart.projectMacros); addMacros(m_projectPart.projectMacros);
} }
@@ -673,7 +675,7 @@ void CompilerOptionsBuilder::addToolchainFlags()
// In case of MSVC we need builtin clang defines to correctly handle clang includes // In case of MSVC we need builtin clang defines to correctly handle clang includes
if (m_projectPart.toolchainType != ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID if (m_projectPart.toolchainType != ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID
&& m_projectPart.toolchainType != ProjectExplorer::Constants::CLANG_CL_TOOLCHAIN_TYPEID) { && m_projectPart.toolchainType != ProjectExplorer::Constants::CLANG_CL_TOOLCHAIN_TYPEID) {
if (m_useBuiltInHeaderPathsAndDefines == UseBuiltin::Yes) if (m_useToolchainMacros == UseToolchainMacros::Yes)
add("-undef"); add("-undef");
else else
add("-fPIC"); add("-fPIC");

9
src/plugins/cpptools/compileroptionsbuilder.h
View File

@@ -33,7 +33,8 @@ namespace CppTools {
enum class UsePrecompiledHeaders : char { Yes, No }; enum class UsePrecompiledHeaders : char { Yes, No };
enum class UseSystemHeader : char { Yes, No }; enum class UseSystemHeader : char { Yes, No };
enum class UseBuiltin : char { Yes, No }; enum class UseTweakedHeaderPaths : char { Yes, No };
enum class UseToolchainMacros : char { Yes, No };
enum class UseLanguageDefines : char { Yes, No }; enum class UseLanguageDefines : char { Yes, No };
class CPPTOOLS_EXPORT CompilerOptionsBuilder class CPPTOOLS_EXPORT CompilerOptionsBuilder
@@ -41,7 +42,8 @@ class CPPTOOLS_EXPORT CompilerOptionsBuilder
public: public:
CompilerOptionsBuilder(const ProjectPart &projectPart, CompilerOptionsBuilder(const ProjectPart &projectPart,
UseSystemHeader useSystemHeader = UseSystemHeader::No, UseSystemHeader useSystemHeader = UseSystemHeader::No,
UseBuiltin useBuiltInHeaderPathsAndDefines = UseBuiltin::Yes, UseToolchainMacros useToolchainMacros = UseToolchainMacros::Yes,
UseTweakedHeaderPaths useTweakedHeaderPaths = UseTweakedHeaderPaths::Yes,
UseLanguageDefines useLanguageDefines = UseLanguageDefines::No, UseLanguageDefines useLanguageDefines = UseLanguageDefines::No,
const QString &clangVersion = QString(), const QString &clangVersion = QString(),
const QString &clangResourceDirectory = QString()); const QString &clangResourceDirectory = QString());
@@ -85,7 +87,8 @@ private:
const ProjectPart &m_projectPart; const ProjectPart &m_projectPart;
const UseSystemHeader m_useSystemHeader; const UseSystemHeader m_useSystemHeader;
const UseBuiltin m_useBuiltInHeaderPathsAndDefines; const UseToolchainMacros m_useToolchainMacros;
const UseTweakedHeaderPaths m_useTweakedHeaderPaths;
const UseLanguageDefines m_useLanguageDefines; const UseLanguageDefines m_useLanguageDefines;
const QString m_clangVersion; const QString m_clangVersion;

18
tests/unit/unittest/compileroptionsbuilder-test.cpp
View File

@@ -89,7 +89,8 @@ TEST_F(CompilerOptionsBuilder, AddToolchainAndProjectMacrosWithoutSkipingLanguag
{ {
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{projectPart, CppTools::CompilerOptionsBuilder compilerOptionsBuilder{projectPart,
CppTools::UseSystemHeader::No, CppTools::UseSystemHeader::No,
CppTools::UseBuiltin::Yes, CppTools::UseToolchainMacros::Yes,
CppTools::UseTweakedHeaderPaths::Yes,
CppTools::UseLanguageDefines::Yes}; CppTools::UseLanguageDefines::Yes};
compilerOptionsBuilder.addToolchainAndProjectMacros(); compilerOptionsBuilder.addToolchainAndProjectMacros();
@@ -147,7 +148,8 @@ TEST_F(CompilerOptionsBuilder, ClangHeadersPath)
{ {
CppTools::CompilerOptionsBuilder compilerOptionsBuilder(projectPart, CppTools::CompilerOptionsBuilder compilerOptionsBuilder(projectPart,
CppTools::UseSystemHeader::No, CppTools::UseSystemHeader::No,
CppTools::UseBuiltin::Yes, CppTools::UseToolchainMacros::Yes,
CppTools::UseTweakedHeaderPaths::Yes,
CppTools::UseLanguageDefines::No, CppTools::UseLanguageDefines::No,
"7.0.0", "7.0.0",
""); "");
@@ -176,7 +178,8 @@ TEST_F(CompilerOptionsBuilder, ClangHeadersAndCppIncludesPathsOrderMacOs)
projectPart.headerPaths.append(defaultPaths); projectPart.headerPaths.append(defaultPaths);
CppTools::CompilerOptionsBuilder compilerOptionsBuilder(projectPart, CppTools::CompilerOptionsBuilder compilerOptionsBuilder(projectPart,
CppTools::UseSystemHeader::No, CppTools::UseSystemHeader::No,
CppTools::UseBuiltin::Yes, CppTools::UseToolchainMacros::Yes,
CppTools::UseTweakedHeaderPaths::Yes,
CppTools::UseLanguageDefines::No, CppTools::UseLanguageDefines::No,
"7.0.0", "7.0.0",
""); "");
@@ -210,7 +213,8 @@ TEST_F(CompilerOptionsBuilder, ClangHeadersAndCppIncludesPathsOrderLinux)
projectPart.toolChainTargetTriple = "x86_64-linux-gnu"; projectPart.toolChainTargetTriple = "x86_64-linux-gnu";
CppTools::CompilerOptionsBuilder compilerOptionsBuilder(projectPart, CppTools::CompilerOptionsBuilder compilerOptionsBuilder(projectPart,
CppTools::UseSystemHeader::No, CppTools::UseSystemHeader::No,
CppTools::UseBuiltin::Yes, CppTools::UseToolchainMacros::Yes,
CppTools::UseTweakedHeaderPaths::Yes,
CppTools::UseLanguageDefines::No, CppTools::UseLanguageDefines::No,
"7.0.0", "7.0.0",
""); "");
@@ -240,7 +244,8 @@ TEST_F(CompilerOptionsBuilder, ClangHeadersAndCppIncludesPathsOrderNoVersion)
projectPart.toolChainTargetTriple = "x86_64-w64-windows-gnu"; projectPart.toolChainTargetTriple = "x86_64-w64-windows-gnu";
CppTools::CompilerOptionsBuilder compilerOptionsBuilder(projectPart, CppTools::CompilerOptionsBuilder compilerOptionsBuilder(projectPart,
CppTools::UseSystemHeader::No, CppTools::UseSystemHeader::No,
CppTools::UseBuiltin::Yes, CppTools::UseToolchainMacros::Yes,
CppTools::UseTweakedHeaderPaths::Yes,
CppTools::UseLanguageDefines::No, CppTools::UseLanguageDefines::No,
"7.0.0", "7.0.0",
""); "");
@@ -277,7 +282,8 @@ TEST_F(CompilerOptionsBuilder, ClangHeadersAndCppIncludesPathsOrderAndroidClang)
projectPart.toolChainTargetTriple = "i686-linux-android"; projectPart.toolChainTargetTriple = "i686-linux-android";
CppTools::CompilerOptionsBuilder compilerOptionsBuilder(projectPart, CppTools::CompilerOptionsBuilder compilerOptionsBuilder(projectPart,
CppTools::UseSystemHeader::No, CppTools::UseSystemHeader::No,
CppTools::UseBuiltin::Yes, CppTools::UseToolchainMacros::Yes,
CppTools::UseTweakedHeaderPaths::Yes,
CppTools::UseLanguageDefines::No, CppTools::UseLanguageDefines::No,
"7.0.0", "7.0.0",
""); "");