mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 14:48:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Convert: Move access to CurrentBinaryDirectory out of loops

Browse Source
This commit is contained in:
Stephen Kelly
2016-09-06 23:52:42 +02:00
parent 21b5fdf9a3
commit 839c65bca0
8 changed files with 42 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmGlobalUnixMakefileGenerator3.cxx
+5 -11
View File
@@ -319,18 +319,15 @@ void cmGlobalUnixMakefileGenerator3::WriteMainCMakefile()
std::string cache = this->GetCMakeInstance()->GetHomeOutputDirectory();
cache += "/CMakeCache.txt";
std::string currentBinDir = lg->GetCurrentBinaryDirectory();
// Save the list to the cmake file.
cmakefileStream
<< "# The top level Makefile was generated from the following files:\n"
<< "set(CMAKE_MAKEFILE_DEPENDS\n"
<< " \""
<< lg->ConvertToRelativePath(lg->GetCurrentBinaryDirectory(), cache)
<< "\"\n";
<< " \"" << lg->ConvertToRelativePath(currentBinDir, cache) << "\"\n";
for (std::vector<std::string>::const_iterator i = lfiles.begin();
i != lfiles.end(); ++i) {
cmakefileStream << " \""
<< lg->ConvertToRelativePath(
lg->GetCurrentBinaryDirectory(), *i)
cmakefileStream << " \"" << lg->ConvertToRelativePath(currentBinDir, *i)
<< "\"\n";
}
cmakefileStream << " )\n\n";
@@ -344,12 +341,9 @@ void cmGlobalUnixMakefileGenerator3::WriteMainCMakefile()
cmakefileStream << "# The corresponding makefile is:\n"
<< "set(CMAKE_MAKEFILE_OUTPUTS\n"
<< " \""
<< lg->ConvertToRelativePath(lg->GetCurrentBinaryDirectory(),
makefileName)
<< lg->ConvertToRelativePath(currentBinDir, makefileName)
<< "\"\n"
<< " \""
<< lg->ConvertToRelativePath(lg->GetCurrentBinaryDirectory(),
check)
<< " \"" << lg->ConvertToRelativePath(currentBinDir, check)
<< "\"\n";
cmakefileStream << " )\n\n";