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/cmInstallCommandArguments.cxx | |
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/cmInstallCommandArguments.cxx')
-rw-r--r-- | Source/cmInstallCommandArguments.cxx | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/Source/cmInstallCommandArguments.cxx b/Source/cmInstallCommandArguments.cxx index 9cba5bf..506954c 100644 --- a/Source/cmInstallCommandArguments.cxx +++ b/Source/cmInstallCommandArguments.cxx @@ -44,9 +44,9 @@ cmInstallCommandArguments::cmInstallCommandArguments() const std::string& cmInstallCommandArguments::GetDestination() const { - if (!this->AbsDestination.empty()) + if (!this->DestinationString.empty()) { - return this->AbsDestination; + return this->DestinationString; } if (this->GenericArguments!=0) { @@ -128,8 +128,8 @@ bool cmInstallCommandArguments::Finalize() { return false; } - this->ComputeDestination(this->Destination.GetString(),this->AbsDestination); - + this->DestinationString = this->Destination.GetString(); + cmSystemTools::ConvertToUnixSlashes(this->DestinationString); return true; } @@ -174,23 +174,3 @@ bool cmInstallCommandArguments::CheckPermissions( // This is not a valid permission. return false; } - -//---------------------------------------------------------------------------- -void cmInstallCommandArguments::ComputeDestination(const std::string& inDest, - std::string& absDest) -{ - if((inDest.size()>0) && !(cmSystemTools::FileIsFullPath(inDest.c_str()))) - { - // Relative paths are treated with respect to the installation prefix. - absDest = "${CMAKE_INSTALL_PREFIX}/"; - absDest += inDest; - } - else - { - // Full paths are absolute. - absDest = inDest; - } - // Format the path nicely. Note this also removes trailing slashes. - cmSystemTools::ConvertToUnixSlashes(absDest); -} - |