[Cmake-commits] CMake branch, master, updated. v2.8.12-562-gde5c298

Brad King brad.king at kitware.com
Fri Nov 1 09:40:11 EDT 2013


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  de5c29890f2139318b5c4c34e69774f3fa70ef30 (commit)
       via  c4373b33b2ad7c6db3b000b0615ed381f05ac5f3 (commit)
       via  cfb666133378d723a046ab7a4463a590deaa7aee (commit)
      from  a549b68d37bc3d1b87cfd407d4edb45fa02079dd (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=de5c29890f2139318b5c4c34e69774f3fa70ef30
commit de5c29890f2139318b5c4c34e69774f3fa70ef30
Merge: a549b68 c4373b3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 1 09:40:05 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 1 09:40:05 2013 -0400

    Merge topic 'constify'
    
    c4373b3 cmTarget: Make GetProperty() const.
    cfb6661 Don't call SetProperty from GetProperty.

diff --cc Source/cmTarget.h
index f3b60b0,7392100..eae5009
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@@ -34,13 -34,12 +34,14 @@@ class cmGlobalGenerator
  class cmComputeLinkInformation;
  class cmListFileBacktrace;
  class cmTarget;
 +class cmGeneratorTarget;
 +class cmTargetTraceDependencies;
  
  struct cmTargetLinkInformationMap:
-   public std::map<std::pair<cmTarget*, std::string>, cmComputeLinkInformation*>
+   public std::map<std::pair<cmTarget const* , std::string>,
+                   cmComputeLinkInformation*>
  {
-   typedef std::map<std::pair<cmTarget*, std::string>,
+   typedef std::map<std::pair<cmTarget const* , std::string>,
                     cmComputeLinkInformation*> derived;
    cmTargetLinkInformationMap() {}
    cmTargetLinkInformationMap(cmTargetLinkInformationMap const& r);

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

Summary of changes:
 Source/cmComputeLinkDepends.cxx            |    3 +-
 Source/cmComputeLinkDepends.h              |    7 +-
 Source/cmComputeLinkInformation.cxx        |    4 +-
 Source/cmComputeLinkInformation.h          |    8 +-
 Source/cmCoreTryCompile.cxx                |    2 +-
 Source/cmExportFileGenerator.cxx           |    6 +-
 Source/cmExportFileGenerator.h             |    6 +-
 Source/cmExportTryCompileFileGenerator.cxx |   18 ++--
 Source/cmExportTryCompileFileGenerator.h   |   12 +-
 Source/cmFindCommon.cxx                    |   15 ++-
 Source/cmGeneratorExpression.cxx           |    6 +-
 Source/cmGeneratorExpression.h             |   10 +-
 Source/cmGeneratorExpressionEvaluator.cxx  |   12 +-
 Source/cmGeneratorExpressionEvaluator.h    |    8 +-
 Source/cmOrderDirectories.cxx              |    2 +-
 Source/cmOrderDirectories.h                |    4 +-
 Source/cmTarget.cxx                        |  211 +++++++++++++++-------------
 Source/cmTarget.h                          |  163 +++++++++++----------
 Source/cmTargetLinkLibrariesCommand.cxx    |    9 +-
 19 files changed, 273 insertions(+), 233 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list