mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-26 18:58:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'load-cache-msg'

Browse Source 
ddf7ebe06e cmake: Friendlier message when trying to --build the wrong dir

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10305
This commit is contained in:
Brad King
2025-02-09 17:37:52 +00:00
committed by Kitware Robot
parent 15a2b506c8 ddf7ebe06e
commit 7d530e7e6f
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmake.cxx
View File

@@ -3850,7 +3850,8 @@ int cmake::Build(int jobs, std::string dir, std::vector<std::string> targets,
std::string cachePath = FindCacheFile(dir);
if (!this->LoadCache(cachePath)) {
std::cerr << "Error: could not load cache\n";
std::cerr
<< "Error: not a CMake build directory (missing CMakeCache.txt)\n";
return 1;
}
cmValue cachedGenerator = this->State->GetCacheEntryValue("CMAKE_GENERATOR");
@@ -3979,7 +3980,8 @@ bool cmake::Open(std::string const& dir, bool dryRun)
std::string cachePath = FindCacheFile(dir);
if (!this->LoadCache(cachePath)) {
std::cerr << "Error: could not load cache\n";
std::cerr
<< "Error: not a CMake build directory (missing CMakeCache.txt)\n";
return false;
}
cmValue genName = this->State->GetCacheEntryValue("CMAKE_GENERATOR");

2
Tests/RunCMake/CommandLine/build-invalid-target-syntax-stderr.txt
View File

@@ -1 +1 @@
^Error: could not load cache
^Error: not a CMake build directory \(missing CMakeCache\.txt\)$

2
Tests/RunCMake/CommandLine/build-no-cache-stderr.txt
View File

@@ -1 +1 @@
^Error: could not load cache$
^Error: not a CMake build directory \(missing CMakeCache\.txt\)$