[Cmake-commits] CMake branch, next, updated. v3.0.0-4547-gdf5e2d8

[Nils Gladitz]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  df5e2d8d9bd26508d1d3e4fa974928ff16aaf42d (commit)
       via  4869bb3f75c5776134a2ceb4a54619ec23a355df (commit)
       via  6dda62e70bd12ef813377b4a699500e131483346 (commit)
      from  309d1a645e358d0b88414d6b95e0d13185d8c1f6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df5e2d8d9bd26508d1d3e4fa974928ff16aaf42d
commit df5e2d8d9bd26508d1d3e4fa974928ff16aaf42d
Merge: 309d1a6 4869bb3
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Jul 28 11:49:24 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 28 11:49:24 2014 -0400

    Merge topic 'pdb-genex' into next
    
    4869bb3f Genex: Disallow PDB genex on targets not created by linker
    6dda62e7 Genex: Revise documentation on PDB generator expressions


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4869bb3f75c5776134a2ceb4a54619ec23a355df
commit 4869bb3f75c5776134a2ceb4a54619ec23a355df
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Jul 28 17:48:13 2014 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Mon Jul 28 17:48:13 2014 +0200

    Genex: Disallow PDB genex on targets not created by linker

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index e3a7681..35df9cd 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -1563,8 +1563,28 @@ struct TargetFilesystemArtifactResultCreator<ArtifactPdbTag>
 {
   static std::string Create(cmTarget* target,
                             cmGeneratorExpressionContext *context,
-                            const GeneratorExpressionContent *)
+                            const GeneratorExpressionContent *content)
   {
+    if(!target->IsDLLPlatform())
+      {
+      ::reportError(context, content->GetOriginalExpression(),
+                    "TARGET_PDB_FILE is only allowed "
+                    "for DLL target platforms.");
+      return std::string();
+      }
+
+    cmTarget::TargetType targetType = target->GetType();
+
+    if(targetType != cmTarget::SHARED_LIBRARY &&
+       targetType != cmTarget::MODULE_LIBRARY &&
+       targetType != cmTarget::EXECUTABLE)
+      {
+      ::reportError(context, content->GetOriginalExpression(),
+                    "TARGET_PDB_FILE is allowed only for "
+                    "targets with linker created artifacts.");
+      return std::string();
+      }
+
     std::string result = target->GetPDBDirectory(context->Config);
     result += "/";
     result += target->GetPDBName(context->Config);

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6dda62e70bd12ef813377b4a699500e131483346
commit 6dda62e70bd12ef813377b4a699500e131483346
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Jul 28 16:52:11 2014 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Mon Jul 28 16:52:11 2014 +0200

    Genex: Revise documentation on PDB generator expressions

diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst
index 4f55687..77259a0 100644
--- a/Help/manual/cmake-generator-expressions.7.rst
+++ b/Help/manual/cmake-generator-expressions.7.rst
@@ -149,11 +149,16 @@ than 4.2.0.
 ``$<TARGET_SONAME_FILE_DIR:tgt>``
   Directory of with soname (.so.3).
 ``$<TARGET_PDB_FILE:tgt>``
-  Full path to program database file (.pdb) where ``tgt`` is the name of a target.
+  Full path to the linker generated program database file (.pdb)
+  where ``tgt`` is the name of a target.
+
+  See also the :prop_tgt:`PDB_NAME` and :prop_tgt:`PDB_OUTPUT_DIRECTORY`
+  target properties and their configuration specific variants
+  :prop_tgt:`PDB_NAME_<CONFIG>` and :prop_tgt:`PDB_OUTPUT_DIRECTORY_<CONFIG>`.
 ``$<TARGET_PDB_FILE_NAME:tgt>``
-  Name of program database file (.pdb).
+  Name of the linker generated program database file (.pdb).
 ``$<TARGET_PDB_FILE_DIR:tgt>``
-  Directory of program database file (.pdb).
+  Directory of the linker generated program database file (.pdb).
 ``$<TARGET_PROPERTY:tgt,prop>``
   Value of the property ``prop`` on the target ``tgt``.
 

-----------------------------------------------------------------------

Summary of changes:
 Help/manual/cmake-generator-expressions.7.rst |   11 ++++++++---
 Source/cmGeneratorExpressionEvaluator.cxx     |   22 +++++++++++++++++++++-
 2 files changed, 29 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake