diff --git a/Help/prop_tgt/COMPILE_PDB_OUTPUT_DIRECTORY.rst b/Help/prop_tgt/COMPILE_PDB_OUTPUT_DIRECTORY.rst
index 3f3df660d8..626b5e0cd2 100644
--- a/Help/prop_tgt/COMPILE_PDB_OUTPUT_DIRECTORY.rst
+++ b/Help/prop_tgt/COMPILE_PDB_OUTPUT_DIRECTORY.rst
@@ -7,9 +7,19 @@ Output directory for the MS debug symbol ``.pdb`` file
 generated by the compiler while building source files.
 
 This property specifies the directory into which the MS debug symbols
-will be placed by the compiler.  This property is initialized by the
-value of the :variable:`CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY` variable
-if it is set when a target is created.
+will be placed by the compiler.
+
+.. versionadded:: 3.12
+
+  The property value may use
+  :manual:`generator expressions <cmake-generator-expressions(7)>`.
+  Multi-configuration generators append a per-configuration
+  subdirectory to the specified directory unless a generator expression
+  is used.
+
+This property is initialized by the value of the
+:variable:`CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY` variable if it is
+set when a target is created.
 
 .. |PDB_XXX| replace:: :prop_tgt:`PDB_OUTPUT_DIRECTORY`
 .. include:: COMPILE_PDB_NOTE.txt
diff --git a/Help/prop_tgt/COMPILE_PDB_OUTPUT_DIRECTORY_CONFIG.rst b/Help/prop_tgt/COMPILE_PDB_OUTPUT_DIRECTORY_CONFIG.rst
index c25c2fc4e5..8a870f8c24 100644
--- a/Help/prop_tgt/COMPILE_PDB_OUTPUT_DIRECTORY_CONFIG.rst
+++ b/Help/prop_tgt/COMPILE_PDB_OUTPUT_DIRECTORY_CONFIG.rst
@@ -14,5 +14,10 @@ property is initialized by the value of the
 :variable:`CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_<CONFIG>` variable
 if it is set when a target is created.
 
+.. versionadded:: 3.12
+
+  Contents of ``COMPILE_PDB_OUTPUT_DIRECTORY_<CONFIG>`` may use
+  :manual:`generator expressions <cmake-generator-expressions(7)>`.
+
 .. |PDB_XXX| replace:: :prop_tgt:`PDB_OUTPUT_DIRECTORY_<CONFIG>`
 .. include:: COMPILE_PDB_NOTE.txt