diff options
| author | Brad King <brad.king@kitware.com> | 2004-07-02 18:09:53 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2004-07-02 18:09:53 (GMT) |
| commit | b8917c7e6c6f7ccdd0d54480b9ece74a2aa6d07b (patch) | |
| tree | b4df07576850f565072ae4db9700a8e1dbc3daab /Source | |
| parent | 419f53ea7b8936b122a1442a44d5dbd3b91dee14 (diff) | |
| download | CMake-b8917c7e6c6f7ccdd0d54480b9ece74a2aa6d07b.zip CMake-b8917c7e6c6f7ccdd0d54480b9ece74a2aa6d07b.tar.gz CMake-b8917c7e6c6f7ccdd0d54480b9ece74a2aa6d07b.tar.bz2 | |
BUG: Fixed generation of installation manifest to account for library versioning symlinks. Also removed DESTDIR prefix from generated manifest.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmFileCommand.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index a1d85b2..75236ba 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -340,6 +340,7 @@ bool cmFileCommand::HandleInstallCommand( return false; } + int destDirLength = 0; if ( destdir && *destdir ) { std::string sdestdir = destdir; @@ -393,6 +394,7 @@ bool cmFileCommand::HandleInstallCommand( } } destination = sdestdir + (destination.c_str() + skip); + destDirLength = int(sdestdir.size()); } if ( files.size() == 0 ) @@ -517,6 +519,8 @@ bool cmFileCommand::HandleInstallCommand( this->SetError(errstring.c_str()); return false; } + smanifest_files += ";"; + smanifest_files += libname.substr(destDirLength);; if ( destfile != soname ) { if ( !cmSystemTools::CreateSymlink(fname.c_str(), soname.c_str()) ) @@ -525,6 +529,8 @@ bool cmFileCommand::HandleInstallCommand( this->SetError(errstring.c_str()); return false; } + smanifest_files += ";"; + smanifest_files += soname.substr(destDirLength); } } cmOStringStream str; @@ -586,7 +592,8 @@ bool cmFileCommand::HandleInstallCommand( perror(err.str().c_str()); } } - smanifest_files += ";" + destfile; + smanifest_files += ";"; + smanifest_files += destfile.substr(destDirLength); } else { |