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 b4dd013d791d3b09e2bc64b84fe29b94cec86b19 (commit)
via a7e6f378567eb91079039cfdedcc4395bb03a5bc (commit)
from 5206c7ef959e078473c01cc0ad8adb210f1bef66 (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=b4dd013d791d3b09e2bc64b84fe29b94cec86b19
commit b4dd013d791d3b09e2bc64b84fe29b94cec86b19
Merge: 5206c7e a7e6f37
Author: Stephen Kelly <[email protected]>
AuthorDate: Sat Oct 10 06:38:36 2015 -0400
Commit: CMake Topic Stage <[email protected]>
CommitDate: Sat Oct 10 06:38:36 2015 -0400
Merge topic 'use-generator-target' into next
a7e6f378 cmHeadToLinkInterfaceMap: Port to cmGeneratorTarget.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7e6f378567eb91079039cfdedcc4395bb03a5bc
commit a7e6f378567eb91079039cfdedcc4395bb03a5bc
Author: Stephen Kelly <[email protected]>
AuthorDate: Thu Oct 8 01:05:41 2015 +0200
Commit: Stephen Kelly <[email protected]>
CommitDate: Sat Oct 10 12:38:23 2015 +0200
cmHeadToLinkInterfaceMap: Port to cmGeneratorTarget.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index c9fdb93..a5e35a1 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4490,7 +4490,7 @@ cmGeneratorTarget::GetLinkInterface(const std::string&
config,
return &hm.begin()->second;
}
- cmOptionalLinkInterface& iface = hm[head->Target];
+ cmOptionalLinkInterface& iface = hm[head];
if(!iface.LibrariesDone)
{
iface.LibrariesDone = true;
@@ -4642,7 +4642,7 @@ cmGeneratorTarget::GetLinkInterfaceLibraries(const
std::string& config,
return &hm.begin()->second;
}
- cmOptionalLinkInterface& iface = hm[head->Target];
+ cmOptionalLinkInterface& iface = hm[head];
if(!iface.LibrariesDone)
{
iface.LibrariesDone = true;
@@ -5079,7 +5079,7 @@ cmGeneratorTarget::GetImportLinkInterface(const
std::string& config,
return &hm.begin()->second;
}
- cmOptionalLinkInterface& iface = hm[headTarget->Target];
+ cmOptionalLinkInterface& iface = hm[headTarget];
if(!iface.AllDone)
{
iface.AllDone = true;
diff --git a/Source/cmLinkItem.h b/Source/cmLinkItem.h
index 10dd465..33780a7 100644
--- a/Source/cmLinkItem.h
+++ b/Source/cmLinkItem.h
@@ -15,6 +15,7 @@
#include "cmListFileCache.h"
+class cmGeneratorTarget;
class cmTarget;
// Basic information about each link item.
@@ -97,7 +98,7 @@ struct cmOptionalLinkInterface: public cmLinkInterface
};
struct cmHeadToLinkInterfaceMap:
- public std::map<cmTarget const*, cmOptionalLinkInterface>
+ public std::map<cmGeneratorTarget const*, cmOptionalLinkInterface>
{
};
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/mailman/listinfo/cmake-commits
