[Cmake-commits] CMake branch, master, updated. v3.3.0-rc1-110-gd17aa60

Brad King brad.king at kitware.com
Mon Jun 8 13:54:12 EDT 2015


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  d17aa60659a1a69f9101c61a149eca5842291226 (commit)
       via  8174e5cd9424a7f45174562f21eb80eb06a3f3d0 (commit)
       via  34e1d6db722b34bb6b4f7b8a7ea53a0bb61c5f58 (commit)
       via  54cb76f299ebcdd07e59d3d0c61f1aa0ffe03a33 (commit)
       via  b661d6c631884e48b27353b0ee9f4f0eb6f5eea7 (commit)
       via  40844a1487ea576987ecec148f77bbeebea9433d (commit)
       via  b1ff32afc67799d08130d457347290a41e426ed0 (commit)
       via  dd0417c7becb9d00bf60827d299b3d520bb138c5 (commit)
       via  125c48660ce5f58e8fa9371cfb9c192f42b19401 (commit)
       via  92b8b1fc3d885091cfef210216b682a389eaf2fb (commit)
       via  7f3e16239fd120eded5e23ee8a836d9e73119244 (commit)
       via  d9df7fa70c854207bb36b45ca0fdca6665bd4bd8 (commit)
       via  db24e41b9d939fb8ad9106f7a8511670505a8ad0 (commit)
       via  4cd13e80f00d4441112f400ff774d91a7fecfff8 (commit)
       via  3e087a408b4a5bad1eb079c61c982ce2dab0973a (commit)
       via  e04217010345fd350d3ddd7897e47eb47eaec1d8 (commit)
       via  c26696eb404888cec525bf3ee2e538ae8532156f (commit)
       via  41fef23b9b8bfa795e2d61e27b12f055ef9bbc39 (commit)
       via  647488570bfe7ce210bfd0675df0eb5147e36ab6 (commit)
       via  6f148e4a48f3f879998e67d9bb30de07f5cf5608 (commit)
       via  5181fae264444ad7736614ceb1e78c51def2b97c (commit)
       via  3ac4b90bfdcca97f1f63056c97afee38cf66ea12 (commit)
       via  7c0aa672fe4f1b5c4a15a89d90cd80009a1399d0 (commit)
       via  9058e27a431b01319b18cc4099780fa017ada113 (commit)
       via  1c48edf8fc8cec71c780cbb1c587f10df0ab7185 (commit)
       via  93cc2eef38eab76831916bfee9d6fe16fbaaf4c1 (commit)
       via  44a8115797cc3f804d653928d71b126b39e29210 (commit)
      from  ccc6fe94453444ebd5e655a9f90a5d074049f846 (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=d17aa60659a1a69f9101c61a149eca5842291226
commit d17aa60659a1a69f9101c61a149eca5842291226
Merge: ccc6fe9 8174e5c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 8 13:54:11 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 8 13:54:11 2015 -0400

    Merge topic 'data-layout'
    
    8174e5cd cmCustomCommand: Remove special member functions.
    34e1d6db cmCustomCommand: Re-arrange data layout.
    54cb76f2 cmComputeLinkDepends: Re-arrange data layout.
    b661d6c6 cmQtAutoGenerators: Re-arrange data layout.
    40844a14 cmProcessTools: Re-arrange data layout.
    b1ff32af cmOrderDirectories: Re-arrange data layout.
    dd0417c7 cmInstallTargetGenerator: Re-arrange data layout.
    125c4866 cmInstallFilesGenerator: Re-arrange data layout.
    92b8b1fc cmGraphVizWriter: Re-arrange data layout.
    7f3e1623 cmGlobalGenerator: Re-arrange data layout.
    d9df7fa7 cmComputeComponentGraph: Re-arrange data layout.
    db24e41b cmCommandArgumentParserHelper: Re-arrange data.
    4cd13e80 cmComputeLinkInformation: Re-arrange data layout.
    3e087a40 cmLocalUnixMakefileGenerator: Re-arrange data layout.
    e0421701 cmMakefile: Re-arrange data layout.
    c26696eb cmSourceFile: Re-arrange data.
    ...

diff --cc Source/cmMakefile.h
index 46df37b,32223b4..6f6ed27
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@@ -717,10 -715,12 +715,9 @@@ public
    void AppendProperty(const std::string& prop, const char *value,
                        bool asString=false);
    const char *GetProperty(const std::string& prop) const;
-   const char *GetProperty(const std::string& prop,
-                           cmProperty::ScopeType scope) const;
+   const char *GetProperty(const std::string& prop, bool chain) const;
    bool GetPropertyAsBool(const std::string& prop) const;
  
 -  const char* GetFeature(const std::string& feature,
 -                         const std::string& config);
 -
    // Get the properties
    cmPropertyMap &GetProperties() { return this->Properties; }
  

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

Summary of changes:
 Source/cmCPluginAPI.cxx                   |   15 ++-----
 Source/cmCacheManager.cxx                 |   11 ++---
 Source/cmCommandArgumentParserHelper.h    |    8 ++--
 Source/cmComputeComponentGraph.h          |    4 +-
 Source/cmComputeLinkDepends.h             |   18 +++-----
 Source/cmComputeLinkInformation.h         |   35 +++++++--------
 Source/cmCustomCommand.cxx                |   53 ++--------------------
 Source/cmCustomCommand.h                  |   10 ++---
 Source/cmGetCMakePropertyCommand.cxx      |    8 ++--
 Source/cmGetDirectoryPropertyCommand.cxx  |    6 ++-
 Source/cmGetPropertyCommand.cxx           |    6 +--
 Source/cmGetSourceFilePropertyCommand.cxx |    6 ++-
 Source/cmGetTargetPropertyCommand.cxx     |    6 ++-
 Source/cmGetTestPropertyCommand.cxx       |    6 ++-
 Source/cmGlobalGenerator.cxx              |    1 -
 Source/cmGlobalGenerator.h                |   14 +++---
 Source/cmGraphVizWriter.cxx               |    2 +-
 Source/cmGraphVizWriter.h                 |   15 +++----
 Source/cmInstallFilesGenerator.cxx        |    6 ++-
 Source/cmInstallFilesGenerator.h          |    2 +-
 Source/cmInstallTargetGenerator.cxx       |    4 +-
 Source/cmInstallTargetGenerator.h         |    6 +--
 Source/cmLocalUnixMakefileGenerator3.h    |   23 +++-------
 Source/cmMakefile.cxx                     |   20 ++++-----
 Source/cmMakefile.h                       |   19 ++++----
 Source/cmOrderDirectories.h               |    5 +--
 Source/cmPolicies.cxx                     |   33 +++++++-------
 Source/cmPolicies.h                       |    8 +---
 Source/cmProcessTools.cxx                 |    2 +-
 Source/cmProcessTools.h                   |    6 +--
 Source/cmProperty.cxx                     |    7 +--
 Source/cmProperty.h                       |    6 +--
 Source/cmPropertyDefinitionMap.cxx        |    8 ++--
 Source/cmPropertyDefinitionMap.h          |    4 +-
 Source/cmPropertyMap.cxx                  |   29 ++++--------
 Source/cmPropertyMap.h                    |   18 ++------
 Source/cmQtAutoGenerators.h               |    3 +-
 Source/cmSetTestsPropertiesCommand.cxx    |    6 ++-
 Source/cmSourceFile.cxx                   |   19 ++++----
 Source/cmSourceFile.h                     |    4 +-
 Source/cmState.cxx                        |   37 ++++++++++------
 Source/cmState.h                          |   10 +++--
 Source/cmTarget.cxx                       |   69 +++++++++++------------------
 Source/cmTarget.h                         |   61 ++++++++++---------------
 Source/cmTest.cxx                         |   18 ++++----
 45 files changed, 272 insertions(+), 385 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list