diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-22 16:36:51 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-22 16:37:01 (GMT) |
| commit | a1f65014a30c7e9da15c87e3cca1d86b480c5339 (patch) | |
| tree | 6f82c3cd8b0ff823fb8590f7e352b09ea1a659c1 /Tests | |
| parent | bcc9ea2b3d9cd3b882dbb2a23502b0392cb21d1b (diff) | |
| parent | dfd5ae7da71ed9330eca7e352b8f9b42babdf3dd (diff) | |
| download | CMake-a1f65014a30c7e9da15c87e3cca1d86b480c5339.zip CMake-a1f65014a30c7e9da15c87e3cca1d86b480c5339.tar.gz CMake-a1f65014a30c7e9da15c87e3cca1d86b480c5339.tar.bz2 | |
Merge topic 'help-mark-default-generator'
dfd5ae7da7 Help: Mark default CMake generator with asterisk
6023fe7ff2 ccmake: Append rather than replace Generators section of docs
7408cd3929 cmake: Return generator docs directly
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2682
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/Server/cmakelib.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Tests/Server/cmakelib.py b/Tests/Server/cmakelib.py index edb5af6..546ae4c 100644 --- a/Tests/Server/cmakelib.py +++ b/Tests/Server/cmakelib.py @@ -276,6 +276,10 @@ def validateGlobalSettings(cmakeCommand, cmakeCommandPath, data): index = cmakeoutput.index('\nGenerators\n\n') cmakeGenerators = [] for line in cmakeoutput[index + 12:].splitlines(): + if not line: + continue + if line[0] == '*': # default generator marker + line = ' ' + line[1:] if not line.startswith(' '): continue if line.startswith(' '): |