diff options
author | Brad King <brad.king@kitware.com> | 2008-01-28 13:38:36 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2008-01-28 13:38:36 (GMT) |
commit | 5594ad488576a77d9c6b8c3c1999a04fb4e6867d (patch) | |
tree | f22726476b6eaaf3832e48c185fe3c112601db17 /Source/cmMakefile.h | |
parent | a7cb9d1120c0555f1da67dd585bd1b4fd16d389d (diff) | |
download | CMake-5594ad488576a77d9c6b8c3c1999a04fb4e6867d.zip CMake-5594ad488576a77d9c6b8c3c1999a04fb4e6867d.tar.gz CMake-5594ad488576a77d9c6b8c3c1999a04fb4e6867d.tar.bz2 |
ENH: Updated exporting and importing of targets to support libraries and configurations.
- Created cmExportFileGenerator hierarchy to implement export file generation
- Installed exports use per-config import files loaded by a central one.
- Include soname of shared libraries in import information
- Renamed PREFIX to NAMESPACE in INSTALL(EXPORT) and EXPORT() commands
- Move addition of CMAKE_INSTALL_PREFIX to destinations to install generators
- Import files compute the installation prefix relative to their location when loaded
- Add mapping of importer configurations to importee configurations
- Rename IMPORT targets to IMPORTED targets to distinguish from windows import libraries
- Scope IMPORTED targets within directories to isolate them
- Place all properties created by import files in the IMPORTED namespace
- Document INSTALL(EXPORT) and EXPORT() commands.
- Document IMPORTED signature of add_executable and add_library
- Enable finding of imported targets in cmComputeLinkDepends
Diffstat (limited to 'Source/cmMakefile.h')
-rw-r--r-- | Source/cmMakefile.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index e511851..5664e25 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -172,9 +172,10 @@ public: void AddDefineFlag(const char* definition); void RemoveDefineFlag(const char* definition); - cmTarget* AddNewTarget(cmTarget::TargetType type, - const char* name, - bool isImported); + /** Create a new imported target with the name and type given. */ + cmTarget* AddImportedTarget(const char* name, cmTarget::TargetType type); + + cmTarget* AddNewTarget(cmTarget::TargetType type, const char* name); /** * Add an executable to the build. @@ -436,10 +437,12 @@ public: * Get the list of targets, const version */ const cmTargets &GetTargets() const { return this->Targets; } - const cmTargets &GetImportedTargets() const { return this->ImportedTargets; } - cmTarget* FindTarget(const char* name, bool useImportedTargets); + cmTarget* FindTarget(const char* name); + /** Find a target to use in place of the given name. The target + returned may be imported or built within the project. */ + cmTarget* FindTargetToUse(const char* name); /** * Get a list of include directories in the build. @@ -766,7 +769,6 @@ protected: // libraries, classes, and executables cmTargets Targets; - cmTargets ImportedTargets; std::vector<cmSourceFile*> SourceFiles; // Tests @@ -842,6 +844,10 @@ private: // stack of list files being read std::deque<cmStdString> ListFileStack; + + cmTarget* FindBasicTarget(const char* name); + std::vector<cmTarget*> ImportedTargetsOwned; + std::map<cmStdString, cmTarget*> ImportedTargets; }; |