mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'fbuild_more_opts'

Browse Source 
99839d1158 FASTBuild: expose more options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11180
This commit is contained in:
Brad King
2025-09-18 13:02:33 +00:00
committed by Kitware Robot
parent 457eaa831d 99839d1158
commit 917f8b217e
14 changed files with 210 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
Source/cmGlobalFastbuildGenerator.cxx
View File

@@ -69,6 +69,62 @@ constexpr auto FASTBUILD_CACHE_PATH = "CMAKE_FASTBUILD_CACHE_PATH";
constexpr auto FASTBUILD_COMPILER_EXTRA_FILES =
"CMAKE_FASTBUILD_COMPILER_EXTRA_FILES";
constexpr auto FASTBUILD_USE_LIGHTCACHE = "CMAKE_FASTBUILD_USE_LIGHTCACHE";
constexpr auto FASTBUILD_USE_RELATIVE_PATHS =
"CMAKE_FASTBUILD_USE_RELATIVE_PATHS";
constexpr auto FASTBUILD_USE_DETERMINISTIC_PATHS =
"CMAKE_FASTBUILD_USE_DETERMINISTIC_PATHS";
constexpr auto FASTBUILD_SOURCE_MAPPING = "CMAKE_FASTBUILD_SOURCE_MAPPING";
constexpr auto FASTBUILD_CLANG_REWRITE_INCLUDES =
"CMAKE_FASTBUILD_CLANG_REWRITE_INCLUDES";
constexpr auto FASTBUILD_CLANG_GCC_UPDATE_XLANG_ARG =
"CMAKE_FASTBUILD_CLANG_GCC_UPDATE_XLANG_ARG";
constexpr auto FASTBUILD_ALLOW_RESPONSE_FILE =
"CMAKE_FASTBUILD_ALLOW_RESPONSE_FILE";
constexpr auto FASTBUILD_FORCE_RESPONSE_FILE =
"CMAKE_FASTBUILD_FORCE_RESPONSE_FILE";
static std::map<std::string, std::string> const compilerIdToFastbuildFamily = {
{ "MSVC", "msvc" }, { "Clang", "clang" }, { "AppleClang", "clang" },
{ "GNU", "gcc" }, { "NVIDIA", "cuda-nvcc" }, { "Clang-cl", "clang-cl" },
};
static std::set<std::string> const supportedLanguages = { "C", "CXX", "CUDA",
"OBJC", "OBJCXX" };
static void ReadCompilerOptions(FastbuildCompiler& compiler, cmMakefile* mf)
{
if (compiler.CompilerFamily == "custom") {
return;
}
if (cmIsOn(mf->GetSafeDefinition(FASTBUILD_USE_LIGHTCACHE))) {
compiler.UseLightCache = true;
}
if (cmIsOn(mf->GetSafeDefinition(FASTBUILD_USE_RELATIVE_PATHS))) {
compiler.UseRelativePaths = true;
}
if (cmIsOn(mf->GetSafeDefinition(FASTBUILD_USE_DETERMINISTIC_PATHS))) {
compiler.UseDeterministicPaths = true;
}
std::string sourceMapping = mf->GetSafeDefinition(FASTBUILD_SOURCE_MAPPING);
if (!sourceMapping.empty()) {
compiler.SourceMapping = std::move(sourceMapping);
}
auto const clangRewriteIncludesDef =
mf->GetDefinition(FASTBUILD_CLANG_REWRITE_INCLUDES);
if (clangRewriteIncludesDef.IsSet() && clangRewriteIncludesDef.IsOff()) {
compiler.ClangRewriteIncludes = false;
}
if (cmIsOn(mf->GetSafeDefinition(FASTBUILD_CLANG_GCC_UPDATE_XLANG_ARG))) {
compiler.ClangGCCUpdateXLanguageArg = true;
}
if (cmIsOn(mf->GetSafeDefinition(FASTBUILD_ALLOW_RESPONSE_FILE))) {
compiler.AllowResponseFile = true;
}
if (cmIsOn(mf->GetSafeDefinition(FASTBUILD_FORCE_RESPONSE_FILE))) {
compiler.ForceResponseFile = true;
}
}
template <class T>
FastbuildAliasNode generateAlias(std::string const& name, char const* postfix,
@@ -815,21 +871,6 @@ void cmGlobalFastbuildGenerator::WriteCompilers()
for (auto const& val : Compilers) {
auto const& compilerDef = val.second;
std::string fastbuildFamily = "custom";
if (compilerDef.Language == "C" || compilerDef.Language == "CXX" ||
compilerDef.Language == "CUDA") {
std::map<std::string, std::string> compilerIdToFastbuildFamily = {
{ "MSVC", "msvc" }, { "Clang", "clang" },
{ "AppleClang", "clang" }, { "GNU", "gcc" },
{ "NVIDIA", "cuda-nvcc" }, { "Clang-cl", "clang-cl" },
};
auto ft = compilerIdToFastbuildFamily.find(compilerDef.CmakeCompilerID);
if (ft != compilerIdToFastbuildFamily.end()) {
fastbuildFamily = ft->second;
}
}
std::string compilerPath = compilerDef.Executable;
// Write out the compiler that has been configured
@@ -841,13 +882,43 @@ void cmGlobalFastbuildGenerator::WriteCompilers()
WriteVariable(extraKey, Quote(extraVal), 1);
}
WriteVariable("Executable", Quote(compilerPath), 1);
WriteVariable("CompilerFamily", Quote(fastbuildFamily), 1);
if (compilerDef.UseLightCache) {
WriteVariable("CompilerFamily", Quote(compilerDef.CompilerFamily), 1);
if (compilerDef.UseLightCache && compilerDef.CompilerFamily == "msvc") {
WriteVariable("UseLightCache_Experimental", "true", 1);
}
if (fastbuildFamily == "clang") {
if (compilerDef.UseRelativePaths) {
WriteVariable("UseRelativePaths_Experimental", "true", 1);
}
if (compilerDef.UseDeterministicPaths) {
WriteVariable("UseDeterministicPaths_Experimental", "true", 1);
}
if (!compilerDef.SourceMapping.empty()) {
WriteVariable("SourceMapping_Experimental",
Quote(compilerDef.SourceMapping), 1);
}
auto const isClang = [&compilerDef] {
return compilerDef.CompilerFamily == "clang" ||
compilerDef.CompilerFamily == "clang-cl";
};
if (!compilerDef.ClangRewriteIncludes && isClang()) {
WriteVariable("ClangRewriteIncludes", "false", 1);
}
if (compilerDef.ClangGCCUpdateXLanguageArg &&
(isClang() || compilerDef.CompilerFamily == "gcc")) {
WriteVariable("ClangGCCUpdateXLanguageArg", "true", 1);
}
if (compilerDef.AllowResponseFile) {
WriteVariable("AllowResponseFile", "true", 1);
}
if (compilerDef.ForceResponseFile) {
WriteVariable("ForceResponseFile", "true", 1);
}
if (compilerDef.DontUseEnv) {
LogMessage("Not using system environment");
@@ -913,14 +984,20 @@ void cmGlobalFastbuildGenerator::AddCompiler(std::string const& language,
mf->GetSafeDefinition("CMAKE_" + language + "_COMPILER_VERSION");
compilerDef.Language = language;
if (compilerDef.CmakeCompilerID == "MSVC" &&
cmIsOn(mf->GetSafeDefinition(FASTBUILD_USE_LIGHTCACHE)) &&
(language == "C" || language == "CXX")) {
compilerDef.UseLightCache = true;
}
cmExpandList(mf->GetSafeDefinition(FASTBUILD_COMPILER_EXTRA_FILES),
compilerDef.ExtraFiles);
if (supportedLanguages.find(language) != supportedLanguages.end()) {
auto const iter =
compilerIdToFastbuildFamily.find(compilerDef.CmakeCompilerID);
if (iter != compilerIdToFastbuildFamily.end()) {
compilerDef.CompilerFamily = iter->second;
}
}
// Has to be called after we determined 'CompilerFamily'.
ReadCompilerOptions(compilerDef, mf);
// If FASTBUILD_COMPILER_EXTRA_FILES is not set - automatically add extra
// files based on compiler (see
// https://fastbuild.org/docs/functions/compiler.html)

8
Source/cmGlobalFastbuildGenerator.h
View File

@@ -186,10 +186,18 @@ struct FastbuildCompiler
std::string Name;
std::string Executable;
std::string CmakeCompilerID;
std::string CompilerFamily = "custom";
std::string CmakeCompilerVersion;
std::string Language;
std::vector<std::string> ExtraFiles;
bool UseLightCache = false;
bool ClangRewriteIncludes = true;
bool ClangGCCUpdateXLanguageArg = false;
bool AllowResponseFile = false;
bool ForceResponseFile = false;
bool UseRelativePaths = false;
bool UseDeterministicPaths = false;
std::string SourceMapping;
// Only used for launchers.
std::string Args;
bool DontUseEnv = false;