diff options
| author | Craig Scott <craig.scott@crascit.com> | 2019-01-13 12:44:18 (GMT) |
|---|---|---|
| committer | Craig Scott <craig.scott@crascit.com> | 2019-01-13 20:13:28 (GMT) |
| commit | 27eb7c5bdb5bb8deefe1772675dc4819592bf036 (patch) | |
| tree | cb132c54cdfb0201a6d2de1976870eadaca2f750 /Source/cmake.h | |
| parent | a1adbc724336b0a4185e34b63e18de03a8b119cf (diff) | |
| download | CMake-27eb7c5bdb5bb8deefe1772675dc4819592bf036.zip CMake-27eb7c5bdb5bb8deefe1772675dc4819592bf036.tar.gz CMake-27eb7c5bdb5bb8deefe1772675dc4819592bf036.tar.bz2 | |
cmake: Ensure source and binary dirs are set
If only the source dir is provided, the binary dir is assumed
to be the working directory. If only the binary dir is provided
and it doesn't yet have a CMakeCache.txt to provide the
source dir, then the source dir is assumed to be the working
directory. This logic was not previously being handled
correctly when -S and/or -B options were involved.
Furthermore, when both were missing, no suitable error
message was provided and an empty string was used for
the build directory.
Fixes: #18707
Diffstat (limited to 'Source/cmake.h')
| -rw-r--r-- | Source/cmake.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmake.h b/Source/cmake.h index d3d0e80..5bca306 100644 --- a/Source/cmake.h +++ b/Source/cmake.h @@ -275,8 +275,7 @@ public: int GetSystemInformation(std::vector<std::string>&); ///! Parse command line arguments - void SetArgs(const std::vector<std::string>&, - bool directoriesSetBefore = false); + void SetArgs(const std::vector<std::string>& args); ///! Is this cmake running as a result of a TRY_COMPILE command bool GetIsInTryCompile() const; |