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

Merge topic 'build-subdir'

Browse Source 
ba1065ab cmake: Add support for "--build ." in subdirectory (#15696)
This commit is contained in:
Brad King 2015-08-18 10:11:58 -04:00 committed by CMake Topic Stage
commit fb329c0bc1
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/cmake.cxx
View File

@ -2745,6 +2745,25 @@ int cmake::Build(const std::string& dir,
}
std::string cachePath = dir;
cmSystemTools::ConvertToUnixSlashes(cachePath);
std::string cacheFile = cachePath;
cacheFile += "/CMakeCache.txt";
if(!cmSystemTools::FileExists(cacheFile.c_str()))
{
// search in parent directories for cache
std::string cmakeFiles = cachePath;
cmakeFiles += "/CMakeFiles";
if(cmSystemTools::FileExists(cmakeFiles.c_str()))
{
std::string cachePathFound =
cmSystemTools::FileExistsInParentDirectories(
"CMakeCache.txt", cachePath.c_str(), "/");
if(!cachePathFound.empty())
{
cachePath = cmSystemTools::GetFilenamePath(cachePathFound);
}
}
}
if(!this->LoadCache(cachePath))
{
std::cerr << "Error: could not load cache\n";