diff options
| author | Brad King <brad.king@kitware.com> | 2020-11-03 12:24:18 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-11-03 12:24:25 (GMT) |
| commit | db02ccf40681afa314602dcb7850b941bdcc06b3 (patch) | |
| tree | 1d7b4f535c076bcdf91f1f6401b3399e6e0bd737 /Source/cmake.cxx | |
| parent | 48840e427ea9dfc12cd57b19fa68bc784612c9cb (diff) | |
| parent | cb2d01c182d31d890990c2bcde1766d4fc65a318 (diff) | |
| download | CMake-db02ccf40681afa314602dcb7850b941bdcc06b3.zip CMake-db02ccf40681afa314602dcb7850b941bdcc06b3.tar.gz CMake-db02ccf40681afa314602dcb7850b941bdcc06b3.tar.bz2 | |
Merge topic 'cmake-presets-no-path-arg-warning'
cb2d01c182 CMakePresets.json: Don't warn if no path argument is given
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5455
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 7a9e493..0274a16 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1005,9 +1005,15 @@ void cmake::SetArgs(const std::vector<std::string>& args) const bool haveSourceDir = !this->GetHomeDirectory().empty(); const bool haveBinaryDir = !this->GetHomeOutputDirectory().empty(); + const bool havePreset = +#ifdef CMAKE_BOOTSTRAP + false; +#else + !presetName.empty(); +#endif if (this->CurrentWorkingMode == cmake::NORMAL_MODE && !haveSourceDir && - !haveBinaryDir) { + !haveBinaryDir && !havePreset) { this->IssueMessage( MessageType::WARNING, "No source or binary directory provided. Both will be assumed to be " |