diff options
| author | Brad King <brad.king@kitware.com> | 2021-01-29 12:54:29 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-01-29 12:54:42 (GMT) |
| commit | 0e60ec7480a63ce596f3c6edf3624dc42dc87365 (patch) | |
| tree | 6acbc1c181af9c713f8449cf11984c7f7b7a2c4d /Source | |
| parent | 59b5b6e11c243e4d45e57caf939107ef9fc44c75 (diff) | |
| parent | 9b5fd04905811ef5fcae740c9edbf5dca7db0511 (diff) | |
| download | CMake-0e60ec7480a63ce596f3c6edf3624dc42dc87365.zip CMake-0e60ec7480a63ce596f3c6edf3624dc42dc87365.tar.gz CMake-0e60ec7480a63ce596f3c6edf3624dc42dc87365.tar.bz2 | |
Merge topic 'intel-llvm-compilers'
9b5fd04905 Tests: Disable MFC test for IntelLLVM due to #18311
ccdf7c0005 Tests: Skip VSGNUFortran test for ifx.
ddaf412dd0 Tests: Skip per file PDBs in PDBDirectoryAndName for IntelLLVM
a619b32768 Tests: Update RunCMake.GenerateExportHeader for IntelLLVM
661b04d6a6 Tests: Skip old PrecompiledHeader test on IntelLLVM
01b1e9c40d Tests: Update CompileFeatures test for IntelLLVM
f26f10184f Tests: Update Module.WriteCompilerDetectionHeader for IntelLLVM
3ceb364b1c Tests: Update RunCMake.FileAPI for IntelLLVM
...
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5594
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Source/CursesDialog/form/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index dca94ee..b3d8369 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -46,6 +46,8 @@ if(NOT CMake_DEFAULT_RECURSION_LIMIT) set(CMake_DEFAULT_RECURSION_LIMIT 100) elseif(MINGW) set(CMake_DEFAULT_RECURSION_LIMIT 400) + elseif(WIN32 AND CMAKE_C_COMPILER_ID STREQUAL "IntelLLVM") + set(CMake_DEFAULT_RECURSION_LIMIT 600) else() set(CMake_DEFAULT_RECURSION_LIMIT 1000) endif() diff --git a/Source/CursesDialog/form/CMakeLists.txt b/Source/CursesDialog/form/CMakeLists.txt index 21c499e..8f26b9a 100644 --- a/Source/CursesDialog/form/CMakeLists.txt +++ b/Source/CursesDialog/form/CMakeLists.txt @@ -5,7 +5,7 @@ project(CMAKE_FORM) # Disable warnings to avoid changing 3rd party code. if(CMAKE_C_COMPILER_ID MATCHES - "^(GNU|Clang|AppleClang|XLClang|XL|VisualAge|SunPro|HP|Intel)$") + "^(GNU|Clang|AppleClang|XLClang|XL|VisualAge|SunPro|HP|Intel|IntelLLVM)$") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w") elseif(CMAKE_C_COMPILER_ID STREQUAL "PathScale") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -woffall") |