diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-10 14:34:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-01-10 14:34:14 (GMT) |
| commit | 91fa6a472cd262014a74d765b003bb1cc9d7ab8a (patch) | |
| tree | 67c8867e35a0ad98f2cb7260fb0744dc890f0f66 /Source | |
| parent | 88c710ab56576fb80abd7940926c0fe461cf2469 (diff) | |
| parent | 2ec3363ea5f5c569063a9094959cf166a54f8ce2 (diff) | |
| download | CMake-91fa6a472cd262014a74d765b003bb1cc9d7ab8a.zip CMake-91fa6a472cd262014a74d765b003bb1cc9d7ab8a.tar.gz CMake-91fa6a472cd262014a74d765b003bb1cc9d7ab8a.tar.bz2 | |
Merge branch 'cmake-CDU-option-parsing' into release-3.13
Merge-request: !2783
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmake.cxx | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 889a5fb..1aff5eb 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -676,10 +676,25 @@ void cmake::SetArgs(const std::vector<std::string>& args, #endif else if (arg.find("-D", 0) == 0) { // skip for now + // in case '-D var=val' is given, also skip the next + // in case '-Dvar=val' is given, don't skip the next + if (arg.size() == 2) { + ++i; + } } else if (arg.find("-U", 0) == 0) { // skip for now + // in case '-U var' is given, also skip the next + // in case '-Uvar' is given, don't skip the next + if (arg.size() == 2) { + ++i; + } } else if (arg.find("-C", 0) == 0) { // skip for now + // in case '-C path' is given, also skip the next + // in case '-Cpath' is given, don't skip the next + if (arg.size() == 2) { + ++i; + } } else if (arg.find("-P", 0) == 0) { // skip for now i++; |