From 71d6a1455e402755023b509629971afd1ed98922 Mon Sep 17 00:00:00 2001 From: Sebastian Holtermann Date: Wed, 22 May 2019 12:09:31 +0200 Subject: Autogen: Evaluate compiler features for the same exectuable only once To speed up the `AUTOGEN` configuration process, evaluate the compiler features only once. The feature evaluation result is stored in the new class `cmQtAutoGen::CompilerFeatures`, and the instance is shared by using `std::shared_ptr`. --- Source/cmQtAutoGenInitializer.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Source/cmQtAutoGenInitializer.h') diff --git a/Source/cmQtAutoGenInitializer.h b/Source/cmQtAutoGenInitializer.h index 6d2dcb6e7a..aa073d1fdd 100644 --- a/Source/cmQtAutoGenInitializer.h +++ b/Source/cmQtAutoGenInitializer.h @@ -67,7 +67,7 @@ public: std::string ExecutableTargetName; cmGeneratorTarget* ExecutableTarget = nullptr; std::string Executable; - bool ExecutableExists = false; + CompilerFeaturesHandle ExecutableFeatures; /// @brief Constructor GenVarsT(GenT gen) @@ -148,7 +148,7 @@ private: void AddCleanFile(std::string const& fileName); bool GetQtExecutable(GenVarsT& genVars, const std::string& executable, - bool ignoreMissingTarget, std::string* output) const; + bool ignoreMissingTarget) const; private: cmQtAutoGenGlobalInitializer* GlobalInitializer; @@ -230,7 +230,6 @@ private: struct RccT : public GenVarsT { bool GlobalTarget = false; - std::vector ListOptions; std::vector Qrcs; /// @brief Constructor -- cgit v1.2.1