[Cmake-commits] CMake branch, next, updated. v2.8.12.1-4994-g020bc42

[Stephen Kelly]

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  020bc42169be2e336b83ddeb1e071bcbc27e1238 (commit)
       via  5c8f61c439c9a275f9add1b3ea1d182a8ca2473a (commit)
      from  ec5d0d47b28f5befb2d9ae2cbd93c1361b243f30 (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=020bc42169be2e336b83ddeb1e071bcbc27e1238
commit 020bc42169be2e336b83ddeb1e071bcbc27e1238
Merge: ec5d0d4 5c8f61c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Nov 9 15:30:46 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Nov 9 15:30:46 2013 -0500

    Merge topic 'target_compile_features' into next
    
    5c8f61c Add missing const.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c8f61c439c9a275f9add1b3ea1d182a8ca2473a
commit 5c8f61c439c9a275f9add1b3ea1d182a8ca2473a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Nov 9 21:28:59 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Nov 9 21:28:59 2013 +0100

    Add missing const.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 3875924..ea7dc97 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2228,7 +2228,7 @@ void cmTarget::GetCompileDefinitions(std::vector<std::string> &list,
 }
 
 //----------------------------------------------------------------------------
-static void processCompileFeatures(cmTarget *tgt,
+static void processCompileFeatures(cmTarget const* tgt,
       const std::vector<cmTargetInternals::TargetPropertyEntry*> &entries,
       std::vector<std::string> &options,
       std::set<std::string> &uniqueOptions,
@@ -2241,7 +2241,7 @@ static void processCompileFeatures(cmTarget *tgt,
 
 //----------------------------------------------------------------------------
 void cmTarget::GetCompileFeatures(std::vector<std::string> &result,
-                                 const char *config)
+                                 const char *config) const
 {
   std::set<std::string> uniqueFeatures;
   cmListFileBacktrace lfbt;
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index e61435c..0dc90a4 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -525,7 +525,7 @@ public:
   void GetCompileOptions(std::vector<std::string> &result,
                          const char *config) const;
   void GetCompileFeatures(std::vector<std::string> &result,
-                           const char *config);
+                           const char *config) const;
 
   bool IsNullImpliedByLinkLibraries(const std::string &p) const;
   bool IsLinkInterfaceDependentBoolProperty(const std::string &p,

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

Summary of changes:
 Source/cmTarget.cxx |    4 ++--
 Source/cmTarget.h   |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake