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

Merge branch 'install-manifest-optimize' into release

This commit is contained in:
Brad King 2015-02-26 15:06:00 -05:00
parent cd935b03bf c48141744e
commit 693a944736
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmFileCommand.cxx
View File

@ -1907,7 +1907,10 @@ protected:
std::string Manifest; std::string Manifest;
void ManifestAppend(std::string const& file) void ManifestAppend(std::string const& file)
{ {
this->Manifest += ";"; if (!this->Manifest.empty())
{
this->Manifest += ";";
}
this->Manifest += file.substr(this->DestDirLength); this->Manifest += file.substr(this->DestDirLength);
} }

17
Source/cmLocalGenerator.cxx
View File

@ -535,17 +535,12 @@ void cmLocalGenerator::GenerateInstallRules()
"${CMAKE_INSTALL_COMPONENT}.txt\")\n" "${CMAKE_INSTALL_COMPONENT}.txt\")\n"
"else()\n" "else()\n"
" set(CMAKE_INSTALL_MANIFEST \"install_manifest.txt\")\n" " set(CMAKE_INSTALL_MANIFEST \"install_manifest.txt\")\n"
"endif()\n\n"; "endif()\n"
fout "\n"
<< "file(WRITE \"" "string(REPLACE \";\" \"\\n\" CMAKE_INSTALL_MANIFEST_CONTENT\n"
<< homedir << "/${CMAKE_INSTALL_MANIFEST}\" " " \"${CMAKE_INSTALL_MANIFEST_FILES}\")\n"
<< "\"\")" << std::endl; "file(WRITE \"" << homedir << "/${CMAKE_INSTALL_MANIFEST}\"\n"
fout " \"${CMAKE_INSTALL_MANIFEST_CONTENT}\")\n";
<< "foreach(file ${CMAKE_INSTALL_MANIFEST_FILES})" << std::endl
<< " file(APPEND \""
<< homedir << "/${CMAKE_INSTALL_MANIFEST}\" "
<< "\"${file}\\n\")" << std::endl
<< "endforeach()" << std::endl;
} }
} }