diff options
| author | William R. Dieter <william.r.dieter@intel.com> | 2021-12-16 23:33:54 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-12-17 14:27:17 (GMT) |
| commit | d7ae61cde6ee64997cbdae5dfb33b1662b86add5 (patch) | |
| tree | abef6dace1d89bb53587e9f997af91d080306868 | |
| parent | b86c6977b11527c31f17a3551d498019fb324fa3 (diff) | |
| download | CMake-d7ae61cde6ee64997cbdae5dfb33b1662b86add5.zip CMake-d7ae61cde6ee64997cbdae5dfb33b1662b86add5.tar.gz CMake-d7ae61cde6ee64997cbdae5dfb33b1662b86add5.tar.bz2 | |
Tests: In RunCMake.GeneratorToolset accept Intel platform toolsets
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>
| -rw-r--r-- | Tests/RunCMake/GeneratorToolset/VsNormal-stdout.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/RunCMake/GeneratorToolset/VsNormal-stdout.txt b/Tests/RunCMake/GeneratorToolset/VsNormal-stdout.txt index 25fa3bf..cfcb448 100644 --- a/Tests/RunCMake/GeneratorToolset/VsNormal-stdout.txt +++ b/Tests/RunCMake/GeneratorToolset/VsNormal-stdout.txt @@ -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[^']*' |