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

cmGeneratorTarget: Revert "always provide a compile PDB filename"

Browse Source 
Revert commit 1a8712d31a (cmGeneratorTarget: always provide a compile
PDB filename, 2025-11-24).  It changed our long-standing conditions for
when a naming a compiler-generated `.pdb` file is explicitly named.
It also caused some `BuildDepends` and `RunCMake.BuildDepends` failures
in VS builds that went unnoticed before merging.

Issue: #27401
This commit is contained in:
Brad King
2025-12-02 16:40:22 -05:00
parent 27c73ff457
commit 809e387a13
3 changed files with 9 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmGeneratorTarget.cxx
View File

@@ -1312,10 +1312,15 @@ std::string cmGeneratorTarget::GetCompilePDBName(
return components.prefix + pdbName + ".pdb";
}
// Always use a name for the compile-time database.
NameComponents const& components =
GetFullNameInternalComponents(config, cmStateEnums::RuntimeBinaryArtifact);
return cmStrCat(components.prefix, this->GetName(), ".pdb");
// If the target is PCH-reused, we need a stable name for the PDB file so
// that reusing targets can construct a stable name for it.
if (this->PchReused) {
NameComponents const& components = GetFullNameInternalComponents(
config, cmStateEnums::RuntimeBinaryArtifact);
return cmStrCat(components.prefix, this->GetName(), ".pdb");
}
return "";
}
std::string cmGeneratorTarget::GetCompilePDBPath(

8
Tests/MSVCDebugInformationFormat/CMakeLists.txt
View File

@@ -79,11 +79,3 @@ endif()
if(CMake_TEST_Fortran)
verify(Fortran verify.F90)
endif()
# Issue 27401; 4.2.0 regression
add_library(PdbCompileFileName PdbCompileFileName.c)
target_compile_definitions(PdbCompileFileName
PRIVATE
"TARGET_DIRECTORY=\"$<TARGET_INTERMEDIATE_DIR:PdbCompileFileName>\"")
set_property(TARGET PdbCompileFileName PROPERTY
MSVC_DEBUG_INFORMATION_FORMAT "ProgramDatabase")

15
Tests/MSVCDebugInformationFormat/PdbCompileFileName.c
View File

@@ -1,15 +0,0 @@
#include <stdio.h>
int main(int argc, char* argv[])
{
int ret = 0;
char const* fname = TARGET_DIRECTORY "/PdbCompileFileName.pdb";
FILE* f = fopen(fname, "r");
if (f) {
fclose(f);
} else {
printf("Failed to open PDB file '%s'\n", fname);
ret = 1;
}
return ret;
}