diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2016-09-09 08:01:45 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-09-26 18:25:20 (GMT) |
| commit | 544f65f44de0bb63a0b427150eb5e2bc90f58396 (patch) | |
| tree | 0d5e4fbbd3a13cd1df30c68cf1293bca01801f20 /Tests/Server/cmakelib.py | |
| parent | 82104cc7a8e831ad20cb87d126c2ff00a851bedc (diff) | |
| download | CMake-544f65f44de0bb63a0b427150eb5e2bc90f58396.zip CMake-544f65f44de0bb63a0b427150eb5e2bc90f58396.tar.gz CMake-544f65f44de0bb63a0b427150eb5e2bc90f58396.tar.bz2 | |
server-mode: Set global configuration of cmake via a command
"setGlobalSettings" can be used to change settings reported by
"globalSettings" command.
Diffstat (limited to 'Tests/Server/cmakelib.py')
| -rw-r--r-- | Tests/Server/cmakelib.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Tests/Server/cmakelib.py b/Tests/Server/cmakelib.py index 79cee80..8beaeef 100644 --- a/Tests/Server/cmakelib.py +++ b/Tests/Server/cmakelib.py @@ -154,12 +154,16 @@ def validateGlobalSettings(cmakeCommand, cmakeCommandPath, data): for line in cmakeoutput[index + 12:].splitlines(): if not line.startswith(' '): continue + if line.startswith(' '): + continue equalPos = line.find('=') tmp = '' if (equalPos > 0): tmp = line[2:equalPos].strip() else: tmp = line.strip() + if tmp.endswith(" [arch]"): + tmp = tmp[0:len(tmp) - 7] if (len(tmp) > 0) and (" - " not in tmp) and (tmp != 'KDevelop3'): cmakeGenerators.append(tmp) @@ -170,8 +174,9 @@ def validateGlobalSettings(cmakeCommand, cmakeCommandPath, data): generators.sort() cmakeGenerators.sort() - if (generators != cmakeGenerators): - sys.exit(1) + for gen in cmakeGenerators: + if (not gen in generators): + sys.exit(1) gen = packet['generator'] if (gen != '' and not (gen in generators)): |