Merge topic 'test-vsnormal-allow-intel' · f5f73e5ac1 - Gogs

Merge topic 'test-vsnormal-allow-intel'

d7ae61cde6 Tests: In RunCMake.GeneratorToolset accept Intel platform toolsets

Acked-by: Kitware Robot <[email protected]>
Merge-request: !6811

Brad King 4 years ago

parent

6b5c836252 d7ae61cde6

commit

f5f73e5ac1

1 changed files with 1 additions and 1 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 1
						
Tests/RunCMake/GeneratorToolset/VsNormal-stdout.txt
							 
								View File
							
				@@ -1,2 +1,2 @@
			
				 -- CMAKE_VS_PLATFORM_NAME='[^']+'
			
				--- CMAKE_VS_PLATFORM_TOOLSET='v[0-9]+'
			
				+-- CMAKE_VS_PLATFORM_TOOLSET='v[0-9]+|Intel[^']+C\+\+ Compiler[^']*'