diff options
author | Lukas Böger <mail@lboeger.de> | 2021-09-19 16:15:21 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2021-09-20 15:15:25 (GMT) |
commit | 2266e223c56be365cadfdf9f394009c095a37c8b (patch) | |
tree | d7d3543ce07ffc3efcde31fce18dd5f1d62e2726 | |
parent | 96c38493849f05724ec5c2b2e0152c5c86c3b5b0 (diff) | |
download | CMake-2266e223c56be365cadfdf9f394009c095a37c8b.zip CMake-2266e223c56be365cadfdf9f394009c095a37c8b.tar.gz CMake-2266e223c56be365cadfdf9f394009c095a37c8b.tar.bz2 |
macOS: Speed up rpath install name dir lookup with a cache
Fixes: #20602
-rw-r--r-- | Source/cmGeneratorTarget.cxx | 15 | ||||
-rw-r--r-- | Source/cmGeneratorTarget.h | 5 |
2 files changed, 20 insertions, 0 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 4bad7ab..30c022f 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -2170,6 +2170,21 @@ bool cmGeneratorTarget::IsImportedSharedLibWithoutSOName( bool cmGeneratorTarget::HasMacOSXRpathInstallNameDir( const std::string& config) const { + TargetPtrToBoolMap& cache = this->MacOSXRpathInstallNameDirCache[config]; + const auto lookup = cache.find(this->Target); + + if (lookup != cache.cend()) { + return lookup->second; + } + + const bool result = this->DetermineHasMacOSXRpathInstallNameDir(config); + cache[this->Target] = result; + return result; +} + +bool cmGeneratorTarget::DetermineHasMacOSXRpathInstallNameDir( + const std::string& config) const +{ bool install_name_is_rpath = false; bool macosx_rpath = false; diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h index 0076085..85b4ea0 100644 --- a/Source/cmGeneratorTarget.h +++ b/Source/cmGeneratorTarget.h @@ -866,6 +866,11 @@ private: mutable std::map<cmSourceFile const*, std::string> Objects; std::set<cmSourceFile const*> ExplicitObjectName; + using TargetPtrToBoolMap = std::unordered_map<cmTarget*, bool>; + mutable std::unordered_map<std::string, TargetPtrToBoolMap> + MacOSXRpathInstallNameDirCache; + bool DetermineHasMacOSXRpathInstallNameDir(const std::string& config) const; + // "config/language" is the key mutable std::map<std::string, std::vector<std::string>> SystemIncludesCache; |