mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-28 18:09:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

fileapi: Make internal "toolchains" field tables more local

Browse Source 
`Toolchains::DumpToolchain` uses some statically initialized tables.
Move them into its definition.  This may avoid initializing them
when not needed.

Issue: #23126
This commit is contained in:
Brad King
2022-01-24 11:32:55 -05:00
parent 7e72a179a9
commit bfacb49154
1 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmFileAPIToolchains.cxx
+19 -22
View File
@@ -30,10 +30,6 @@ class Toolchains
cmFileAPI& FileAPI; cmFileAPI& FileAPI;
unsigned long Version; unsigned long Version;
static const std::vector<ToolchainVariable> CompilerVariables;
static const std::vector<ToolchainVariable> CompilerImplicitVariables;
static const ToolchainVariable SourceFileExtensionsVariable;
Json::Value DumpToolchains(); Json::Value DumpToolchains();
Json::Value DumpToolchain(std::string const& lang); Json::Value DumpToolchain(std::string const& lang);
Json::Value DumpToolchainVariables( Json::Value DumpToolchainVariables(
@@ -48,24 +44,6 @@ public:
Json::Value Dump(); Json::Value Dump();
}; };
const std::vector<ToolchainVariable> Toolchains::CompilerVariables{
{ "path", "COMPILER", false },
{ "id", "COMPILER_ID", false },
{ "version", "COMPILER_VERSION", false },
{ "target", "COMPILER_TARGET", false },
};
const std::vector<ToolchainVariable> Toolchains::CompilerImplicitVariables{
{ "includeDirectories", "IMPLICIT_INCLUDE_DIRECTORIES", true },
{ "linkDirectories", "IMPLICIT_LINK_DIRECTORIES", true },
{ "linkFrameworkDirectories", "IMPLICIT_LINK_FRAMEWORK_DIRECTORIES", true },
{ "linkLibraries", "IMPLICIT_LINK_LIBRARIES", true },
};
const ToolchainVariable Toolchains::SourceFileExtensionsVariable{
"sourceFileExtensions", "SOURCE_FILE_EXTENSIONS", true
};
Toolchains::Toolchains(cmFileAPI& fileAPI, unsigned long version) Toolchains::Toolchains(cmFileAPI& fileAPI, unsigned long version)
: FileAPI(fileAPI) : FileAPI(fileAPI)
, Version(version) , Version(version)
@@ -94,6 +72,25 @@ Json::Value Toolchains::DumpToolchains()
Json::Value Toolchains::DumpToolchain(std::string const& lang) Json::Value Toolchains::DumpToolchain(std::string const& lang)
{ {
static const std::vector<ToolchainVariable> CompilerVariables{
{ "path", "COMPILER", false },
{ "id", "COMPILER_ID", false },
{ "version", "COMPILER_VERSION", false },
{ "target", "COMPILER_TARGET", false },
};
static const std::vector<ToolchainVariable> CompilerImplicitVariables{
{ "includeDirectories", "IMPLICIT_INCLUDE_DIRECTORIES", true },
{ "linkDirectories", "IMPLICIT_LINK_DIRECTORIES", true },
{ "linkFrameworkDirectories", "IMPLICIT_LINK_FRAMEWORK_DIRECTORIES",
true },
{ "linkLibraries", "IMPLICIT_LINK_LIBRARIES", true },
};
static const ToolchainVariable SourceFileExtensionsVariable{
"sourceFileExtensions", "SOURCE_FILE_EXTENSIONS", true
};
const auto& mf = const auto& mf =
this->FileAPI.GetCMakeInstance()->GetGlobalGenerator()->GetMakefiles()[0]; this->FileAPI.GetCMakeInstance()->GetGlobalGenerator()->GetMakefiles()[0];
Json::Value toolchain = Json::objectValue; Json::Value toolchain = Json::objectValue;