diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-10-09 11:31:43 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-10-10 08:14:04 +0000 |
| commit | 5d1fe43a7a2a064b4ed6ab0a97c331529042c30e (patch) | |
| tree | 5a3db59b61411137e8e0040d5a55f7a6378762bd | |
| parent | e23f96e98cd546ff9c695a1d457b9cfd7223ee97 (diff) | |
CMake: Run CMake less often
Run CMake less often to extract information on the CMake tool.
Change-Id: I959df99fee16e6196db61c84aee7908d66af222d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmaketool.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmaketool.cpp b/src/plugins/cmakeprojectmanager/cmaketool.cpp index 0ed1d50513..10c0b10fe1 100644 --- a/src/plugins/cmakeprojectmanager/cmaketool.cpp +++ b/src/plugins/cmakeprojectmanager/cmaketool.cpp @@ -378,19 +378,17 @@ CMakeTool::ReaderType CMakeTool::readerType() const void CMakeTool::readInformation(CMakeTool::QueryType type) const { - if ((type == QueryType::GENERATORS && !m_introspection->m_generators.isEmpty()) - || (type == QueryType::SERVER_MODE && m_introspection->m_queriedServerMode) - || (type == QueryType::VERSION && !m_introspection->m_version.fullVersion.isEmpty())) - return; - if (!m_introspection->m_triedCapabilities) { fetchFromCapabilities(); m_introspection->m_triedCapabilities = true; m_introspection->m_queriedServerMode = true; // Got added after "-E capabilities" support! - if (type == QueryType::GENERATORS && !m_introspection->m_generators.isEmpty()) - return; } + if ((type == QueryType::GENERATORS && !m_introspection->m_generators.isEmpty()) + || (type == QueryType::SERVER_MODE && m_introspection->m_queriedServerMode) + || (type == QueryType::VERSION && !m_introspection->m_version.fullVersion.isEmpty())) + return; + if (type == QueryType::GENERATORS) { fetchGeneratorsFromHelp(); } else if (type == QueryType::SERVER_MODE) { |