[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1087-g34a49de

[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  34a49dea15324864a4a1de345b35ef022597bf9e (commit)
       via  8bd424dfb3f40e0a614a237ebb41affb64a5171a (commit)
      from  8ecf49ece50dbf2205c5faad847219439689fd01 (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=34a49dea15324864a4a1de345b35ef022597bf9e
commit 34a49dea15324864a4a1de345b35ef022597bf9e
Merge: 8ecf49e 8bd424d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Mar 15 06:08:44 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Mar 15 06:08:44 2014 -0400

    Merge topic 'CONFIG-LOCATION-CMP0026-for-master' into next
    
    8bd424df Port CMP0026 change to master.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8bd424dfb3f40e0a614a237ebb41affb64a5171a
commit 8bd424dfb3f40e0a614a237ebb41affb64a5171a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Mar 15 11:07:57 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Mar 15 11:07:57 2014 +0100

    Port CMP0026 change to master.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 0c89656..527b66a 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2733,7 +2733,7 @@ const char *cmTarget::GetProperty(const char* prop,
     // Support "<CONFIG>_LOCATION".
     if(cmHasLiteralSuffix(prop, "_LOCATION"))
       {
-      std::string configName(prop, strlen(prop) - 9);
+      std::string configName(prop.c_str(), prop.size() - 9);
       if(configName != "IMPORTED")
         {
         if (!this->HandleLocationPropertyPolicy())
@@ -2741,7 +2741,7 @@ const char *cmTarget::GetProperty(const char* prop,
           return 0;
           }
         this->Properties.SetProperty(prop,
-                                     this->GetLocation(configName.c_str()),
+                                     this->GetLocation(configName),
                                      cmProperty::TARGET);
         }
       }

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

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


hooks/post-receive
-- 
CMake