summaryrefslogtreecommitdiffstats
path: root/Tests/Server
diff options
context:
space:
mode:
authorArtur Ryt <artur.ryt@gmail.com>2018-11-30 18:43:22 (GMT)
committerBrad King <brad.king@kitware.com>2019-01-18 17:57:34 (GMT)
commitdfd5ae7da71ed9330eca7e352b8f9b42babdf3dd (patch)
treecc08e60849d92faed7790abf994ebd5196d80a0e /Tests/Server
parent6023fe7ff22848bc29ee67395eeb10f066758c06 (diff)
downloadCMake-dfd5ae7da71ed9330eca7e352b8f9b42babdf3dd.zip
CMake-dfd5ae7da71ed9330eca7e352b8f9b42babdf3dd.tar.gz
CMake-dfd5ae7da71ed9330eca7e352b8f9b42babdf3dd.tar.bz2
Help: Mark default CMake generator with asterisk
Required extracting default generator evaluation to explicit function, as Visual Studio generators get validated during their construction. Fixes: #18544
Diffstat (limited to 'Tests/Server')
-rw-r--r--Tests/Server/cmakelib.py4
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(' '):