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

Merge topic 'fastbuild-pdb-quoting'

Browse Source 
6f1fe8853d FASTBuild: Fix default MSVC compiler PDB paths
dff020e679 FASTBuild: Add internal helper for intermediate directory creation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Eduard Voronkin <edward.voronkin@gmail.com>
Merge-request: !11483
This commit is contained in:
Brad King
2025-12-08 15:15:25 +00:00
committed by Kitware Robot
parent 9fab9dc7f1 6f1fe8853d
commit 67ed00a1ca
2 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
Source/cmFastbuildNormalTargetGenerator.cxx
View File

@@ -68,6 +68,12 @@ std::string const UNITY_BUILD_BATCH_SIZE("UNITY_BUILD_BATCH_SIZE");
std::string const SKIP_UNITY_BUILD_INCLUSION("SKIP_UNITY_BUILD_INCLUSION");
std::string const UNITY_GROUP("UNITY_GROUP");
#ifdef _WIN32
char const kPATH_SLASH = '\\';
#else
char const kPATH_SLASH = '/';
#endif
} // anonymous namespace
cmFastbuildNormalTargetGenerator::cmFastbuildNormalTargetGenerator(
@@ -523,6 +529,12 @@ void cmFastbuildNormalTargetGenerator::EnsureDirectoryExists(
}
}
void cmFastbuildNormalTargetGenerator::EnsureParentDirectoryExists(
std::string const& path) const
{
this->EnsureDirectoryExists(cmSystemTools::GetParentDirectory(path));
}
std::vector<std::string>
cmFastbuildNormalTargetGenerator::GetManifestsAsFastbuildPath() const
{
@@ -804,24 +816,31 @@ void cmFastbuildNormalTargetGenerator::ComputePaths(
this->ConvertToFastbuildPath(linkerPDB));
}
}
if (GeneratorTarget->GetType() <= cmStateEnums::OBJECT_LIBRARY) {
std::string const pdbDir = GeneratorTarget->GetCompilePDBDirectory(Config);
LogMessage("GetCompilePDBDirectory: " + pdbDir);
EnsureDirectoryExists(pdbDir);
std::string pdbName = this->GeneratorTarget->GetCompilePDBName(Config);
LogMessage("GetCompilePDBName: " + pdbDir);
// If we don't have Compiler's PDB, we must add a trailing slash to satisfy
// MSVC.
bool needTrailingSlash = false;
if (pdbName.empty()) {
needTrailingSlash = true;
}
std::string const compilerPDB = cmStrCat(pdbDir, '\\', pdbName);
if (!compilerPDB.empty()) {
target.Variables["CompilerPDB"] = cmSystemTools::ConvertToOutputPath(
this->ConvertToFastbuildPath(compilerPDB) +
(needTrailingSlash ? "\\ " : ""));
std::string const compilerPDB = this->ComputeTargetCompilePDB(this->Config);
if (!compilerPDB.empty()) {
LogMessage("ComputeTargetCompilePDB: " + compilerPDB);
std::string compilerPDBArg = cmSystemTools::ConvertToOutputPath(
this->ConvertToFastbuildPath(compilerPDB));
if (cmHasSuffix(compilerPDB, '/')) {
// The compiler will choose the .pdb file name.
this->EnsureDirectoryExists(compilerPDB);
// ConvertToFastbuildPath dropped the trailing slash. Add it back.
// We do this after ConvertToOutputPath so that we can use a forward
// slash in the case that the argument is quoted.
if (cmHasSuffix(compilerPDBArg, '"')) {
// A quoted trailing backslash requires escaping, e.g., `/Fd"dir\\"`,
// but fbuild does not parse such arguments correctly as of 1.15.
// Always use a forward slash.
compilerPDBArg.insert(compilerPDBArg.size() - 1, 1, '/');
} else {
// An unquoted trailing slash or backslash is fine.
compilerPDBArg.push_back(kPATH_SLASH);
}
} else {
// We have an explicit .pdb path with file name.
this->EnsureParentDirectoryExists(compilerPDB);
}
target.Variables["CompilerPDB"] = std::move(compilerPDBArg);
}
std::string const impLibFullPath =
GeneratorTarget->GetFullPath(Config, cmStateEnums::ImportLibraryArtifact);

1
Source/cmFastbuildNormalTargetGenerator.h
View File

@@ -157,4 +157,5 @@ private:
std::vector<std::string> GetManifestsAsFastbuildPath() const;
void EnsureDirectoryExists(std::string const& path) const;
void EnsureParentDirectoryExists(std::string const& path) const;
};