This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 2d83690fe2c785b5cda0fb6c0822b879071a649d (commit) via ba1065ab7b3c293245b3bbe733f8f062b9aa7ac9 (commit) from b5cc08fa9acd1678a671b7a4cefaa9c901bb15b7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d83690fe2c785b5cda0fb6c0822b879071a649d commit 2d83690fe2c785b5cda0fb6c0822b879071a649d Merge: b5cc08f ba1065a Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Sat Aug 15 00:59:49 2015 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Sat Aug 15 00:59:49 2015 -0400 Merge topic 'build-subdir' into next ba1065ab cmake: Add support for "--build ." in subdirectory (#15696) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba1065ab7b3c293245b3bbe733f8f062b9aa7ac9 commit ba1065ab7b3c293245b3bbe733f8f062b9aa7ac9 Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Fri Aug 14 22:45:53 2015 -0600 Commit: Clinton Stimpson <clin...@elemtech.com> CommitDate: Fri Aug 14 22:46:53 2015 -0600 cmake: Add support for "--build ." in subdirectory (#15696) diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 2855329..62b3f83 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -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"; ----------------------------------------------------------------------- Summary of changes: Source/cmake.cxx | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits