diff options
| author | Brad King <brad.king@kitware.com> | 2021-12-20 14:21:20 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-12-20 14:21:33 (GMT) |
| commit | f5f73e5ac1820567c3741b89896ed6bf2b94fbdb (patch) | |
| tree | 8888eb66228459c8f16c686761408a2098b33050 | |
| parent | 6b5c836252f897a79d7293a951ab79fd1755f16b (diff) | |
| parent | d7ae61cde6ee64997cbdae5dfb33b1662b86add5 (diff) | |
| download | CMake-f5f73e5ac1820567c3741b89896ed6bf2b94fbdb.zip CMake-f5f73e5ac1820567c3741b89896ed6bf2b94fbdb.tar.gz CMake-f5f73e5ac1820567c3741b89896ed6bf2b94fbdb.tar.bz2 | |
Merge topic 'test-vsnormal-allow-intel'
d7ae61cde6 Tests: In RunCMake.GeneratorToolset accept Intel platform toolsets
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6811
| -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[^']*' |