kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Fixed generation of installation manifest to account for library versioning symlinks. Also removed DESTDIR prefix from generated manifest.

Browse Source
This commit is contained in:
Brad King 2004-07-02 14:09:53 -04:00
parent 419f53ea7b
commit b8917c7e6c
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmFileCommand.cxx
View File

@ -340,6 +340,7 @@ bool cmFileCommand::HandleInstallCommand(
return false; return false;
} }
int destDirLength = 0;
if ( destdir && *destdir ) if ( destdir && *destdir )
{ {
std::string sdestdir = destdir; std::string sdestdir = destdir;
@ -393,6 +394,7 @@ bool cmFileCommand::HandleInstallCommand(
} }
} }
destination = sdestdir + (destination.c_str() + skip); destination = sdestdir + (destination.c_str() + skip);
destDirLength = int(sdestdir.size());
} }
if ( files.size() == 0 ) if ( files.size() == 0 )
@ -517,6 +519,8 @@ bool cmFileCommand::HandleInstallCommand(
this->SetError(errstring.c_str()); this->SetError(errstring.c_str());
return false; return false;
} }
smanifest_files += ";";
smanifest_files += libname.substr(destDirLength);;
if ( destfile != soname ) if ( destfile != soname )
{ {
if ( !cmSystemTools::CreateSymlink(fname.c_str(), soname.c_str()) ) if ( !cmSystemTools::CreateSymlink(fname.c_str(), soname.c_str()) )
@ -525,6 +529,8 @@ bool cmFileCommand::HandleInstallCommand(
this->SetError(errstring.c_str()); this->SetError(errstring.c_str());
return false; return false;
} }
smanifest_files += ";";
smanifest_files += soname.substr(destDirLength);
} }
} }
cmOStringStream str; cmOStringStream str;
@ -586,7 +592,8 @@ bool cmFileCommand::HandleInstallCommand(
perror(err.str().c_str()); perror(err.str().c_str());
} }
} }
smanifest_files += ";" + destfile; smanifest_files += ";";
smanifest_files += destfile.substr(destDirLength);
} }
else else
{ {