summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalGenerator.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2010-11-19 18:23:17 (GMT)
committerBrad King <brad.king@kitware.com>2010-11-19 18:23:17 (GMT)
commitbc7395c096be40f8a0fecbab4aa7539c05898ef2 (patch)
tree626e2ae901fbf4d789678a407a407c024232cd68 /Source/cmGlobalGenerator.h
parentacf60463deb97bb29ba6e9ec1a7783594a3609cb (diff)
parentfd614e60b51e11ac8a99c19d541be9a8e5c141dc (diff)
downloadCMake-bc7395c096be40f8a0fecbab4aa7539c05898ef2.zip
CMake-bc7395c096be40f8a0fecbab4aa7539c05898ef2.tar.gz
CMake-bc7395c096be40f8a0fecbab4aa7539c05898ef2.tar.bz2
Merge branch 'vs-target-dependencies' into imported-target-dependencies
Diffstat (limited to 'Source/cmGlobalGenerator.h')
-rw-r--r--Source/cmGlobalGenerator.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index e68ed08..7e43124 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -16,6 +16,7 @@
#include "cmStandardIncludes.h"
#include "cmTarget.h" // For cmTargets
+#include "cmTargetDepend.h" // For cmTargetDependSet
class cmake;
class cmMakefile;
@@ -233,7 +234,7 @@ public:
virtual const char* GetCleanTargetName() { return 0; }
// Class to track a set of dependencies.
- class TargetDependSet: public std::set<cmTarget*> {};
+ typedef cmTargetDependSet TargetDependSet;
// what targets does the specified target depend on directly
// via a target_link_libraries or add_dependencies