[Cmake-commits] CMake branch, master, updated. v2.8.10.2-390-gdb925e3

[Brad King]

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, master has been updated
       via  db925e3532719af44022b50d2462ac5b050907bc (commit)
       via  894f52f32d96ae92df0ba3dac2a70fe9c87e818d (commit)
       via  f5b1980fb27fa902d37856ec3e22daddfeb9d52f (commit)
       via  c67b8124f735e7f96567a276e16969607b300e43 (commit)
       via  d0f950fdba88ac08d0e25e340fe558eba008810e (commit)
       via  26def1771dfbf502129212c9e728e34860477fac (commit)
       via  0c657dc637ca4da6861102c7306069ad157ec08d (commit)
       via  e04f737c7a3e66c49e2d50813af1fa40a415eff8 (commit)
       via  b0c8f73eb62c5651b4a039f95676cae310bcada9 (commit)
       via  77475fe61d0a1bbd562228bf66d5043bd001cb48 (commit)
       via  b2f1700bc7caf12c3f28890ebe183ae09c90d7dc (commit)
      from  b5ab3f0707cae7affa14423012997503825a867c (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=db925e3532719af44022b50d2462ac5b050907bc
commit db925e3532719af44022b50d2462ac5b050907bc
Merge: b5ab3f0 894f52f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 7 14:20:13 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 7 14:20:13 2013 -0500

    Merge topic 'interface-includes-defines'
    
    894f52f Handle INTERFACE properties transitively for includes and defines.
    f5b1980 Populate the ExportedTargets member early in GenerateMainFile
    c67b812 Make cycles in target properties ignored, not an error.
    d0f950f Use mapped config properties to evaluate $<CONFIG>
    26def17 Make all relevant targets available in the genex context.
    0c657dc Add API to populate INTERFACE properties in exported targets.
    e04f737 Add API to extract target names from a genex string.
    b0c8f73 Add the TARGET_NAME generator expression.
    77475fe Allow generator expressions to require literals.
    b2f1700 GenEx: Add expressions to specify build- or install-only values

diff --cc Source/cmGeneratorExpressionEvaluator.cxx
index d86ae54,b7ce155..82becaf
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@@ -291,19 -320,8 +322,19 @@@ static const struct TargetPropertyNode 
      cmsys::RegularExpression propertyNameValidator;
      propertyNameValidator.compile("^[A-Za-z0-9_]+$");
  
-     cmTarget* target = context->Target;
+     cmTarget* target = context->HeadTarget;
      std::string propertyName = *parameters.begin();
 +
 +    if (!target && parameters.size() == 1)
 +      {
 +      reportError(context, content->GetOriginalExpression(),
 +          "$<TARGET_PROPERTY:prop> may only be used with targets.  It may not "
 +          "be used with add_custom_command.  Specify the target to read a "
 +          "property from using the $<TARGET_PROPERTY:tgt,prop> signature "
 +          "instead.");
 +      return std::string();
 +      }
 +
      if (parameters.size() == 2)
        {
        if (parameters.begin()->empty() && parameters[1].empty())

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

Summary of changes:
 Source/cmDocumentGeneratorExpressions.h            |   10 +
 Source/cmExportBuildFileGenerator.cxx              |   40 +++-
 Source/cmExportFileGenerator.cxx                   |  195 ++++++++++++++++++++
 Source/cmExportFileGenerator.h                     |   19 ++
 Source/cmExportInstallFileGenerator.cxx            |   42 +++-
 Source/cmGeneratorExpression.cxx                   |  108 ++++++++++-
 Source/cmGeneratorExpression.h                     |   11 +-
 Source/cmGeneratorExpressionDAGChecker.cxx         |   18 +-
 Source/cmGeneratorExpressionDAGChecker.h           |   12 +-
 Source/cmGeneratorExpressionEvaluator.cxx          |  111 +++++++++++-
 Source/cmGeneratorExpressionEvaluator.h            |    4 +-
 Source/cmTarget.cxx                                |  108 +++++++----
 Source/cmTarget.h                                  |    5 +
 Tests/ExportImport/Export/CMakeLists.txt           |   75 ++++++++-
 Tests/ExportImport/Export/testLibDepends.c         |   16 ++
 Tests/ExportImport/Import/A/CMakeLists.txt         |   15 ++
 Tests/ExportImport/Import/A/deps_iface.cpp         |   24 +++
 Tests/GeneratorExpression/CMakeLists.txt           |   17 ++-
 Tests/GeneratorExpression/check-common.cmake       |    5 +
 Tests/GeneratorExpression/check-part1.cmake        |   56 ++++++
 Tests/GeneratorExpression/check-part2.cmake        |   28 +++
 Tests/GeneratorExpression/check.cmake              |   80 --------
 .../TargetIncludeDirectories/CMakeLists.txt        |   31 +++
 ...{BadAND-result.txt => BadTargetName-result.txt} |    0
 .../GeneratorExpression/BadTargetName-stderr.txt   |    8 +
 .../{BadZero.cmake => BadTargetName.cmake}         |    4 +-
 .../GeneratorExpression/RunCMakeTest.cmake         |    1 +
 27 files changed, 868 insertions(+), 175 deletions(-)
 create mode 100644 Tests/ExportImport/Import/A/deps_iface.cpp
 create mode 100644 Tests/GeneratorExpression/check-common.cmake
 create mode 100644 Tests/GeneratorExpression/check-part1.cmake
 create mode 100644 Tests/GeneratorExpression/check-part2.cmake
 delete mode 100644 Tests/GeneratorExpression/check.cmake
 copy Tests/RunCMake/GeneratorExpression/{BadAND-result.txt => BadTargetName-result.txt} (100%)
 create mode 100644 Tests/RunCMake/GeneratorExpression/BadTargetName-stderr.txt
 copy Tests/RunCMake/GeneratorExpression/{BadZero.cmake => BadTargetName.cmake} (67%)


hooks/post-receive
-- 
CMake