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

CMake: Handle STATIC types in CMakeCache.txt

Browse Source 
Read STATIC types, but never write them out to the user. They are
still useful for Creator-internal sanity checks.

Change-Id: I8a13820291378de2370761be537f78fba1e45a0f
Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-04-08 14:14:03 +02:00
committed by Tobias Hunger
parent 12708d9b25
commit 42385146c7
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -207,7 +207,10 @@ QList<ConfigModel::DataItem> CMakeBuildConfiguration::completeCMakeConfiguration
m_completeConfigurationCache = m_buildDirManager->parsedConfiguration(); m_completeConfigurationCache = m_buildDirManager->parsedConfiguration();
CMakeConfig cache = Utils::filtered(m_completeConfigurationCache, CMakeConfig cache = Utils::filtered(m_completeConfigurationCache,
[](const CMakeConfigItem &i) { return i.type != CMakeConfigItem::INTERNAL; }); [](const CMakeConfigItem &i) {
return i.type != CMakeConfigItem::INTERNAL
&& i.type != CMakeConfigItem::STATIC;
});
return Utils::transform(cache, [](const CMakeConfigItem &i) { return Utils::transform(cache, [](const CMakeConfigItem &i) {
ConfigModel::DataItem j; ConfigModel::DataItem j;
j.key = QString::fromUtf8(i.key); j.key = QString::fromUtf8(i.key);

4
src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp
View File

@@ -120,6 +120,8 @@ CMakeConfigItem CMakeConfigItem::fromString(const QString &s)
t = CMakeConfigItem::BOOL; t = CMakeConfigItem::BOOL;
else if (type == QLatin1String("INTERNAL")) else if (type == QLatin1String("INTERNAL"))
t = CMakeConfigItem::INTERNAL; t = CMakeConfigItem::INTERNAL;
else if (type == QLatin1String("STATIC"))
t = CMakeConfigItem::STATIC;
item.key = key.toUtf8(); item.key = key.toUtf8();
item.type = t; item.type = t;
@@ -130,7 +132,7 @@ CMakeConfigItem CMakeConfigItem::fromString(const QString &s)
QString CMakeConfigItem::toString() const QString CMakeConfigItem::toString() const
{ {
if (key.isEmpty()) if (key.isEmpty() || type == CMakeProjectManager::CMakeConfigItem::STATIC)
return QString(); return QString();
QString typeStr; QString typeStr;

2
src/plugins/cmakeprojectmanager/cmakeconfigitem.h
View File

@@ -34,7 +34,7 @@ namespace CMakeProjectManager {
class CMakeConfigItem { class CMakeConfigItem {
public: public:
enum Type { FILEPATH, PATH, BOOL, STRING, INTERNAL }; enum Type { FILEPATH, PATH, BOOL, STRING, INTERNAL, STATIC };
CMakeConfigItem(); CMakeConfigItem();
CMakeConfigItem(const CMakeConfigItem &other); CMakeConfigItem(const CMakeConfigItem &other);
CMakeConfigItem(const QByteArray &k, Type t, const QByteArray &d, const QByteArray &v); CMakeConfigItem(const QByteArray &k, Type t, const QByteArray &d, const QByteArray &v);