diff options
author | Brad King <brad.king@kitware.com> | 2006-01-13 23:18:32 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2006-01-13 23:18:32 (GMT) |
commit | 22c62c9e65817e25b077f88222c682efa0188ccb (patch) | |
tree | 077abb80fc469c06f08cc4509ff72bcbee8384c7 /Source/cmOrderLinkDirectories.h | |
parent | 262295615925c082ec3f98c3fc1f6c259d09ee6f (diff) | |
download | CMake-22c62c9e65817e25b077f88222c682efa0188ccb.zip CMake-22c62c9e65817e25b077f88222c682efa0188ccb.tar.gz CMake-22c62c9e65817e25b077f88222c682efa0188ccb.tar.bz2 |
BUG: Sweeping changes to cleanup computation of target names. This should
fix many bugs related to target names being computed inconsistently.
- Centralized computation of a target's file name to a method in
cmTarget. Now that global knowledge is always available the
*_CMAKE_PATH cache variables are no longer needed.
- Centralized computation of link library command lines and link
directory search order.
- Moved computation of link directories needed to link CMake targets
to be after evaluation of linking dependencies.
This also removed alot of duplicate code in which each version had its
own bugs.
This commit is surrounded by the tags
CMake-TargetNameCentralization1-pre
and
CMake-TargetNameCentralization1-post
so make the large set of changes easy to identify.
Diffstat (limited to 'Source/cmOrderLinkDirectories.h')
-rw-r--r-- | Source/cmOrderLinkDirectories.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Source/cmOrderLinkDirectories.h b/Source/cmOrderLinkDirectories.h index 49830b5..88f6e16 100644 --- a/Source/cmOrderLinkDirectories.h +++ b/Source/cmOrderLinkDirectories.h @@ -49,8 +49,9 @@ class cmOrderLinkDirectories public: cmOrderLinkDirectories(); ///! set link information from the target - void SetLinkInformation(cmTarget&, cmTarget::LinkLibraryType, - const char* targetLibrary); + void SetLinkInformation(const char* targetName, + const std::vector<std::string>& linkLibraries, + const std::vector<std::string>& linkDirectories); ///! Compute the best order for -L paths from GetLinkLibraries bool DetermineLibraryPathOrder(); ///! Get the results from DetermineLibraryPathOrder @@ -65,12 +66,18 @@ public: // CMAKE_LINK_LIBRARY_SUFFIX void AddLinkExtension(const char* e) { + if(e && *e) + { m_LinkExtensions.push_back(e); + } } // should be set from CMAKE_STATIC_LIBRARY_PREFIX void SetLinkPrefix(const char* s) { + if(s) + { m_LinkPrefix = s; + } } // Return any warnings if the exist std::string GetWarnings(); |