[Cmake-commits] CMake branch, master, updated. v3.4.0-rc1-166-gaad0e62

[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  aad0e62060783539ef8ec4d09ad12ed9dacb5e7c (commit)
       via  1c1c2a1201682d17491026cb392c31ae5e63e1a5 (commit)
       via  c66084f5d7df57c991d0f498de04a5f00ae0fcc1 (commit)
       via  83c29e3903f947f9d4b5ed79a535f850b3b946e2 (commit)
       via  1988255448d7e0f92f4d2f12cc8fc17b1429c328 (commit)
       via  c1f687b1ad2fe3ed7a8a2d300f1e12df59161cbc (commit)
       via  a6e1f05c154d123b01bfe75c13d3e016c9074f72 (commit)
       via  654002feb88a9a219e2d6b6011c7dccc791627b1 (commit)
       via  922c89014f372ca38303b4258345c23027046616 (commit)
       via  eaa5b9cbb1b145b76eb0448df1ce3a3c63ee13c6 (commit)
       via  f539da126b55933fae6f40feea35e820cb632877 (commit)
       via  1c5d70f9c2b9b7e2aeaf1515ef72a6e9282ecde0 (commit)
       via  064c2488119269e88422ea444f87bdd44c4f6589 (commit)
       via  3e428fdcb4640411f8cbc4adc42c30b9c8b8032e (commit)
       via  110fd2fba1cbd6c3d89f5460d3f58a94d52d4546 (commit)
       via  e73916992c6893572f24ee4fa631b33445d6cdf6 (commit)
       via  c5718217ad242ca0fc6e6b15f4ee670e4a332c93 (commit)
       via  bf5eb4a3f394051d9245a7f0c3a18b4a1d2c948a (commit)
       via  49017cddab23702d8228a195f64934e61ab7667e (commit)
       via  0bae4a416f9f1b9090499d26f8508660f4f3fc95 (commit)
       via  1abc20d81df3ee9845904b356960870526fe3276 (commit)
       via  50dc9b44404f4f31aa24cf17247f10539c3807b2 (commit)
       via  8b0168863ed121c7d9f05e3282e2f59490ff6c42 (commit)
       via  e0261a1e20f14cc2ca593bb978479b52954397d8 (commit)
       via  df42dbb3558a6ba604ab584b21dfe7f8722eb025 (commit)
       via  a8429a402da4aeb717f4af234c8d14d1c4e10ed7 (commit)
       via  370bb92c10cd8fec7770267c93515623e4168012 (commit)
      from  83d2b6f378ddb462a105c2754f0b061f31709655 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aad0e62060783539ef8ec4d09ad12ed9dacb5e7c
commit aad0e62060783539ef8ec4d09ad12ed9dacb5e7c
Merge: 83d2b6f 1c1c2a1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 12 10:26:20 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 10:26:20 2015 -0400

    Merge topic 'use-generator-target'
    
    1c1c2a12 cmGeneratorTarget: Port ExpandLinkItems away from cmTarget.
    c66084f5 cmGeneratorTarget: Port GetImportLinkInterface away from cmTarget.
    83c29e39 cmGeneratorTarget: Port ComputeLinkImplementationLibraries away from cmTarget.
    19882554 cmGeneratorTarget: Port handleSystemIncludesDep away from cmTarget.
    c1f687b1 cmGeneratorTarget: Port GetLinkImplementationLibrariesInternal.
    a6e1f05c cmGeneratorTarget: Port ComputeLinkInterface away from cmTarget.
    654002fe cmGeneratorTarget: Port ComputeLinkInterfaceLibraries away from cmTarget.
    922c8901 cmGeneratorTarget: Port GetLinkInterface away from cmTarget.
    eaa5b9cb cmGeneratorTarget: Port cmTargetCollectLinkLanguages away from cmTarget.
    f539da12 cmGeneratorTarget: Port GetLinkInterfaceLibraries away from cmTarget.
    1c5d70f9 cmGeneratorTarget: Port processILibs away from cmTarget.
    064c2488 cmComputeLinkDepends: Port some API to cmGeneratorTarget.
    3e428fdc cmGeneratorTarget: Move IsImportedSharedLibWithoutSOName from cmTarget.
    110fd2fb cmGeneratorTarget: Move GetOutputTargetType from cmTarget.
    e7391699 cmGeneratorTarget: Move HasMacOSXRpathInstallNameDir from cmTarget.
    c5718217 cmGeneratorTarget: Move HaveInstallTreeRPATH from cmTarget.
    ...

diff --cc Source/cmComputeLinkInformation.cxx
index ff3d1ee,7e34611..c76cb7a
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@@ -1918,9 -1914,9 +1914,9 @@@ void cmComputeLinkInformation::GetRPath
    // build tree.
    bool linking_for_install =
      (for_install ||
 -     this->Target->Target->GetPropertyAsBool("BUILD_WITH_INSTALL_RPATH"));
 +     this->Target->GetPropertyAsBool("BUILD_WITH_INSTALL_RPATH"));
    bool use_install_rpath =
-     (outputRuntime && this->Target->Target->HaveInstallTreeRPATH() &&
+     (outputRuntime && this->Target->HaveInstallTreeRPATH() &&
       linking_for_install);
    bool use_build_rpath =
      (outputRuntime && this->Target->HaveBuildTreeRPATH(this->Config) &&

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

Summary of changes:
 Source/cmComputeLinkDepends.cxx                |   30 +-
 Source/cmComputeLinkDepends.h                  |    3 +-
 Source/cmComputeLinkInformation.cxx            |   42 +-
 Source/cmComputeLinkInformation.h              |    4 +-
 Source/cmComputeTargetDepends.cxx              |    2 +-
 Source/cmExportFileGenerator.cxx               |    4 +-
 Source/cmGeneratorExpressionNode.cxx           |   11 +-
 Source/cmGeneratorTarget.cxx                   |  709 ++++++++++++++++++++++--
 Source/cmGeneratorTarget.h                     |   93 +++-
 Source/cmGlobalXCodeGenerator.cxx              |    6 +-
 Source/cmInstallTargetGenerator.cxx            |    2 +-
 Source/cmListFileCache.h                       |    9 -
 Source/cmLocalGenerator.cxx                    |    4 +-
 Source/cmLocalVisualStudio6Generator.cxx       |   24 +-
 Source/cmLocalVisualStudio7Generator.cxx       |   18 +-
 Source/cmLocalVisualStudioGenerator.cxx        |    6 +-
 Source/cmLocalXCodeGenerator.cxx               |    6 +-
 Source/cmMakefileExecutableTargetGenerator.cxx |    7 +-
 Source/cmMakefileLibraryTargetGenerator.cxx    |   11 +-
 Source/cmMakefileTargetGenerator.cxx           |    3 +-
 Source/cmNinjaNormalTargetGenerator.cxx        |    8 +-
 Source/cmNinjaTargetGenerator.cxx              |    4 +-
 Source/cmTarget.cxx                            |  671 +---------------------
 Source/cmTarget.h                              |   70 +--
 Source/cmVisualStudio10TargetGenerator.cxx     |    7 +-
 25 files changed, 870 insertions(+), 884 deletions(-)


hooks/post-receive
-- 
CMake