diff options
| author | Brad King <brad.king@kitware.com> | 2023-05-02 12:49:27 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-05-02 08:49:35 -0400 |
| commit | 2488d6dbf7481087fa9ee4a0c77c5e3b0a503387 (patch) | |
| tree | 7785e8023449b17ab73c1d80b1f54feb042b6d18 /Tests | |
| parent | c4cc3462036ea9e7217f926a23c7574bb0221702 (diff) | |
| parent | 195339e7ac605faad3cbd577a5c2a55672131d20 (diff) | |
| download | cmake-2488d6dbf7481087fa9ee4a0c77c5e3b0a503387.tar.gz | |
Merge topic 'ci-intel-windows'
195339e7ac gitlab-ci: Add job testing Intel 2021.9.0 compilers on Windows
1b44973343 gitlab-ci: Add job testing IntelLLVM 2023.1.0 compilers on Windows
a5fd03a53d Tests: Teach CompileFeatures to tolerate __STDC_VERSION__ on Intel Classic
1b7649604e Tests: Teach RunCMake to ignore Intel Classic deprecation on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8447
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CompileFeatures/default_dialect.c | 3 | ||||
| -rw-r--r-- | Tests/RunCMake/RunCMake.cmake | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Tests/CompileFeatures/default_dialect.c b/Tests/CompileFeatures/default_dialect.c index b990e53258..c696c83f3e 100644 --- a/Tests/CompileFeatures/default_dialect.c +++ b/Tests/CompileFeatures/default_dialect.c @@ -20,7 +20,8 @@ # error Buildsystem error # endif # if defined(__STDC_VERSION__) && \ - !(defined(__SUNPRO_C) && __STDC_VERSION__ == 199409L) + !(__STDC_VERSION__ == 199409L && \ + (defined(__INTEL_COMPILER) || defined(__SUNPRO_C))) # error Unexpected __STDC_VERSION__ definition # endif #endif diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake index 8e85f6cf46..b8efe35e30 100644 --- a/Tests/RunCMake/RunCMake.cmake +++ b/Tests/RunCMake/RunCMake.cmake @@ -175,7 +175,7 @@ function(run_cmake test) "|Your license to use PGI[^\n]*expired" "|Please obtain a new version at" "|contact PGI Sales at" - "|icp?c: remark #10441: The Intel\\(R\\) C\\+\\+ Compiler Classic \\(ICC\\) is deprecated" + "|ic(p?c|l): remark #10441: The Intel\\(R\\) C\\+\\+ Compiler Classic \\(ICC\\) is deprecated" "|[^\n]*install_name_tool: warning: changes being made to the file will invalidate the code signature in:" "|[^\n]*xcodebuild[^\n]*DVTCoreDeviceEnabledState: DVTCoreDeviceEnabledState_Disabled set via user default" |