echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tests: In RunCMake.GeneratorToolset accept Intel platform toolsets

Browse Source 
The RunCMake.GeneratorToolset test expected platform toolsets to have a
name beginning with 'v' followed by one or more decimal digits, as all
the Microsoft platform toolsets follow that naming convention.
The Intel platform toolsets begin with "Intel" and have various
additional strings depending on the compiler version.

This change accepts the toolsets delivered by Intel in addition to those
from Microsoft.

Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
This commit is contained in:
William R. Dieter 2021-12-16 15:33:54 -08:00 committed by Brad King
parent b86c6977b1
commit d7ae61cde6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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[^']*'