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 'install-object-names-build-short'

Browse Source 
b2ebfd7709 shortobj: properly force long names when computing long names
1980e47192 Tests/IntermediateDirStrategy: test install paths when using SHORT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11201
This commit is contained in:
Brad King
2025-09-18 12:36:00 +00:00
committed by Kitware Robot
parent 13dd58b70e b2ebfd7709
commit baf695bfb0
8 changed files with 59 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmLocalGenerator.cxx
View File

@@ -4507,7 +4507,7 @@ std::string cmLocalGenerator::GetObjectFileNameWithoutTarget(
}
// Strip source file extension when shortening object file paths
if (this->UseShortObjectNames()) {
if (useShortObjectNames) {
objectName = cmSystemTools::GetFilenameWithoutExtension(objectName);
}
// Store the new extension.

3
Source/cmLocalVisualStudioGenerator.cxx
View File

@@ -99,8 +99,9 @@ void cmLocalVisualStudioGenerator::ComputeObjectFilenames(
if (counts[cmSystemTools::LowerCase(longObjectName)] > 1) {
const_cast<cmGeneratorTarget*>(gt)->AddExplicitObjectName(sf);
bool keptSourceExtension;
bool forceShortObjectName = false;
longObjectName = this->GetObjectFileNameWithoutTarget(
*sf, dir_max, &keptSourceExtension, custom_ext);
*sf, dir_max, &keptSourceExtension, custom_ext, &forceShortObjectName);
}
si.second.ShortLoc.emplace(shortObjectName);
si.second.LongLoc.Update(longObjectName);