[Cmake-commits] CMake branch, next, updated. v3.0.0-4327-g90d9a5d

[Ben Boeckel]

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  90d9a5d367cf433b8431aedbe08604284efb9a9a (commit)
       via  511213e24af5a639920dc94fd7df1f3d24176a88 (commit)
       via  fe0c29487b890e5f3f7f7196ee1b2cf4d5f27397 (commit)
      from  d913fb3da353c0e9b2424a1bd358b9f8b2082315 (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=90d9a5d367cf433b8431aedbe08604284efb9a9a
commit 90d9a5d367cf433b8431aedbe08604284efb9a9a
Merge: d913fb3 511213e
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Jul 17 09:27:40 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 17 09:27:40 2014 -0400

    Merge topic 'dev/target-fastpaths' into next
    
    511213e2 fixup! cmTarget: Use static strings for special property names
    fe0c2948 fixup! cmTarget: Fast path for regular properties


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=511213e24af5a639920dc94fd7df1f3d24176a88
commit 511213e24af5a639920dc94fd7df1f3d24176a88
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Jul 17 09:25:49 2014 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu Jul 17 09:25:49 2014 -0400

    fixup! cmTarget: Use static strings for special property names

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 7479133..843761f 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -5076,7 +5076,7 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget const* tgt,
                                           CompatibleType t,
                                           PropertyType *)
 {
-  PropertyType propContent = getTypedProperty<PropertyType>(tgt, p.c_str(),
+  PropertyType propContent = getTypedProperty<PropertyType>(tgt, p,
                                                             0);
   const bool explicitlySet = tgt->GetProperties()
                                   .find(p)
@@ -5130,7 +5130,7 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget const* tgt,
                             != theTarget->GetProperties().end();
     PropertyType ifacePropContent =
                     getTypedProperty<PropertyType>(theTarget,
-                              interfaceProperty.c_str(), 0);
+                              interfaceProperty, 0);
 
     std::string reportEntry;
     if (ifaceIsSet)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe0c29487b890e5f3f7f7196ee1b2cf4d5f27397
commit fe0c29487b890e5f3f7f7196ee1b2cf4d5f27397
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Jul 17 09:21:19 2014 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu Jul 17 09:21:19 2014 -0400

    fixup! cmTarget: Fast path for regular properties

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index a203a7f..7479133 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -3260,12 +3260,12 @@ const char *cmTarget::GetProperty(const std::string& prop,
               }
             if (!noMessage)
               {
-              e << "Target \"" << this->Name << "\" contains $<TARGET_OBJECTS> "
-              "generator expression in its sources list.  This content was not "
-              "previously part of the SOURCES property when that property was "
-              "read at configure time.  Code reading that property needs to be "
-              "adapted to ignore the generator expression using the "
-              "string(GENEX_STRIP) command.";
+              e << "Target \"" << this->Name << "\" contains "
+              "$<TARGET_OBJECTS> generator expression in its sources list.  "
+              "This content was not previously part of the SOURCES property "
+              "when that property was read at configure time.  Code reading "
+              "that property needs to be adapted to ignore the generator "
+              "expression using the string(GENEX_STRIP) command.";
               context->IssueMessage(messageType, e.str());
               }
             if (addContent)

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

Summary of changes:
 Source/cmTarget.cxx |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake