diff options
author | Brad King <brad.king@kitware.com> | 2012-01-25 18:39:26 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2012-01-25 19:42:31 (GMT) |
commit | ca39c5cdd1ca28516791e00f213d6dee2179c6df (patch) | |
tree | cf36435b8b38cf4c830390c73c263f870551e408 /Source/cmGlobalGenerator.h | |
parent | 731f996ce070bbba1b4913050497afa95436f2d2 (diff) | |
download | CMake-ca39c5cdd1ca28516791e00f213d6dee2179c6df.zip CMake-ca39c5cdd1ca28516791e00f213d6dee2179c6df.tar.gz CMake-ca39c5cdd1ca28516791e00f213d6dee2179c6df.tar.bz2 |
Optionally allow IMPORTED targets to be globally visible
Consider the case motivating commit e01cce28 (Allow add_dependencies()
on imported targets, 2010-11-19). An imported target references a file
generated at build time by a custom target on which it depends. Had the
file been built directly using add_library or add_executable its target
name would have been visible globally. Therefore the imported target
representing the file should be globally visible also.
Teach the IMPORTED signature of add_(executable|library) to accept a new
"GLOBAL" option to make the imported target visible globally.
Diffstat (limited to 'Source/cmGlobalGenerator.h')
-rw-r--r-- | Source/cmGlobalGenerator.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index ded3345..1a0e41a 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -230,7 +230,7 @@ public: std::set<cmStdString> const& GetDirectoryContent(std::string const& dir, bool needDisk = true); - void AddTarget(cmTargets::value_type &v); + void AddTarget(cmTarget* t); virtual const char* GetAllTargetName() const { return "ALL_BUILD"; } virtual const char* GetInstallTargetName() const { return "INSTALL"; } @@ -333,6 +333,7 @@ protected: // All targets in the entire project. std::map<cmStdString,cmTarget *> TotalTargets; + std::map<cmStdString,cmTarget *> ImportedTargets; virtual const char* GetPredefinedTargetsFolder(); virtual bool UseFolderProperty(); |