[Cmake-commits] CMake branch, next, updated. v3.4.2-2068-g8ef9c76
Brad King
brad.king at kitware.com
Thu Jan 21 11:25:53 EST 2016
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 8ef9c76b623f3994bcc04c03cacc1f301fb22154 (commit)
via 7dbfdddf33ab2d52e471c8533897bc2d7aeb40c9 (commit)
via 750ae8d5a8890f5d8091105a0b03bee085cc4dff (commit)
from 1ca14513c5df74ec3d4d5b9febbe1627a6a46cb9 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ef9c76b623f3994bcc04c03cacc1f301fb22154
commit 8ef9c76b623f3994bcc04c03cacc1f301fb22154
Merge: 1ca1451 7dbfddd
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 21 11:25:52 2016 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 21 11:25:52 2016 -0500
Merge topic 'fix-use-generator-target' into next
7dbfdddf cmExportInstallFileGenerator: Fix crash in FindNamespaces
750ae8d5 CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7dbfdddf33ab2d52e471c8533897bc2d7aeb40c9
commit 7dbfdddf33ab2d52e471c8533897bc2d7aeb40c9
Author: Andrey Pokrovskiy <wonder.mice at gmail.com>
AuthorDate: Wed Jan 20 18:29:58 2016 -0800
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 21 10:53:30 2016 -0500
cmExportInstallFileGenerator: Fix crash in FindNamespaces
Refactoring merged by commit 9afbb733ec (Merge topic
'use-generator-target', 2015-10-20) in and around commit 381e7afd
(cmExportSet: Store a cmGeneratorTarget, 2015-10-17) forgot to update
one place in this method. This leads to a crash in code such as
add_library(A a.c)
add_library(B b.c)
target_link_libraries(B A)
install(TARGETS B DESTINATION lib EXPORT ExpB)
install(EXPORT ExpB DESTINATION lib/cmake/test)
add_executable(C c.c)
install(TARGETS C DESTINATION bin EXPORT ExpC)
Fix the target name reference to avoid using an unpopulated Target
pointer.
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index b695904..71418e8 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -496,7 +496,7 @@ cmExportInstallFileGenerator
bool containsTarget = false;
for(unsigned int i=0; i<targets->size(); i++)
{
- if (name == (*targets)[i]->Target->GetName())
+ if (name == (*targets)[i]->TargetName)
{
containsTarget = true;
break;
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Source/cmExportInstallFileGenerator.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list