diff options
| author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2016-01-05 16:39:57 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2016-01-07 10:36:54 +0000 |
| commit | bbed47b646863491c8dd54b82978dfe907543d70 (patch) | |
| tree | eee5ce848794a070cef6f6102f7284dd32c93058 /src/plugins/cmakeprojectmanager | |
| parent | af1127f757896190be16bafb2c0a2640a24195c2 (diff) | |
| download | qt-creator-bbed47b646863491c8dd54b82978dfe907543d70.tar.gz | |
CMake: Remove some repetitions
Change-Id: Ie3dc64cb311a2df297dca63f7eb369e749046cf3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/cmakeprojectmanager')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/generatorinfo.cpp | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/src/plugins/cmakeprojectmanager/generatorinfo.cpp b/src/plugins/cmakeprojectmanager/generatorinfo.cpp index 84b7e3f92d..5b9f84a0a5 100644 --- a/src/plugins/cmakeprojectmanager/generatorinfo.cpp +++ b/src/plugins/cmakeprojectmanager/generatorinfo.cpp @@ -43,6 +43,20 @@ namespace CMakeProjectManager { namespace Internal { +static bool isMsvcFlavor(const ProjectExplorer::Abi &abi) { + switch (abi.osFlavor()) { + case ProjectExplorer::Abi::WindowsMsvc2005Flavor: + case ProjectExplorer::Abi::WindowsMsvc2008Flavor: + case ProjectExplorer::Abi::WindowsMsvc2010Flavor: + case ProjectExplorer::Abi::WindowsMsvc2012Flavor: + case ProjectExplorer::Abi::WindowsMsvc2013Flavor: + case ProjectExplorer::Abi::WindowsMsvc2015Flavor: + return true; + default: + return false; + } +} + GeneratorInfo::GeneratorInfo() : m_kit(0), m_isNinja(false) {} @@ -69,12 +83,7 @@ QByteArray GeneratorInfo::generator() const if (m_isNinja) { return "Ninja"; } else if (targetAbi.os() == ProjectExplorer::Abi::WindowsOS) { - if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2005Flavor - || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2008Flavor - || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2010Flavor - || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2012Flavor - || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2013Flavor - || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2015Flavor) { + if (isMsvcFlavor(targetAbi)) { return "NMake Makefiles"; } else if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor) { if (Utils::HostOsInfo::isWindowsHost()) @@ -109,12 +118,7 @@ QString GeneratorInfo::displayName() const ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(m_kit); ProjectExplorer::Abi targetAbi = tc->targetAbi(); if (targetAbi.os() == ProjectExplorer::Abi::WindowsOS) { - if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2005Flavor - || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2008Flavor - || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2010Flavor - || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2012Flavor - || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2013Flavor - || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2015Flavor) { + if (isMsvcFlavor(targetAbi)) { return tr("NMake Generator (%1)").arg(m_kit->displayName()); } else if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor) { if (Utils::HostOsInfo::isWindowsHost()) @@ -144,12 +148,7 @@ QList<GeneratorInfo> GeneratorInfo::generatorInfosFor(ProjectExplorer::Kit *k, N ProjectExplorer::Abi targetAbi = tc->targetAbi(); if (n != ForceNinja) { if (targetAbi.os() == ProjectExplorer::Abi::WindowsOS) { - if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2005Flavor - || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2008Flavor - || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2010Flavor - || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2012Flavor - || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2013Flavor - || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2015Flavor) { + if (isMsvcFlavor(targetAbi)) { if (hasCodeBlocks) results << GeneratorInfo(k); } else if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor) { |