[Cmake-commits] CMake branch, next, updated. v2.8.11-2063-gacc9ada
Stephen Kelly
steveire at gmail.com
Fri May 17 09:18:50 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, next has been updated
via acc9ada3a959b5a4b17e8bc6952f1c4defb53842 (commit)
via a1257cf0d4ce765a64ea46d33de1c55fc057a1fe (commit)
from 992fd59e8c589b29f56b6587a034ad38e010538d (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=acc9ada3a959b5a4b17e8bc6952f1c4defb53842
commit acc9ada3a959b5a4b17e8bc6952f1c4defb53842
Merge: 992fd59 a1257cf
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri May 17 09:17:56 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 17 09:17:56 2013 -0400
Merge topic 'add-EXPORT_NAME-property' into next
a1257cf Get the name from the dependee.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a1257cf0d4ce765a64ea46d33de1c55fc057a1fe
commit a1257cf0d4ce765a64ea46d33de1c55fc057a1fe
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri May 17 10:15:24 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri May 17 15:15:01 2013 +0200
Get the name from the dependee.
This can later be changed to GetExportName.
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index ad12b5a..800537c 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -395,13 +395,14 @@ cmExportInstallFileGenerator::HandleMissingTarget(
std::string& link_libs, std::vector<std::string>& missingTargets,
cmMakefile* mf, cmTarget* depender, cmTarget* dependee)
{
- std::string name = dependee->GetName();
+ const std::string name = dependee->GetName();
std::vector<std::string> namespaces = this->FindNamespaces(mf, name);
int targetOccurrences = (int)namespaces.size();
if (targetOccurrences == 1)
{
std::string missingTarget = namespaces[0];
- missingTarget += name;
+
+ missingTarget += dependee->GetName();
link_libs += missingTarget;
missingTargets.push_back(missingTarget);
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmExportInstallFileGenerator.cxx | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list