diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-31 16:19:33 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-31 16:19:38 (GMT) |
| commit | d526327079e23748dd2a87acd4d9b4b1174725bf (patch) | |
| tree | 06999346ec466a6e9e124d22d398959b9f4e207a /Modules | |
| parent | 29368abde7d5b4d3d6f734aa530e82dd9f4ee739 (diff) | |
| parent | a624a3e1b3105e94ad30722e3053679a3b7d5b7e (diff) | |
| download | CMake-d526327079e23748dd2a87acd4d9b4b1174725bf.zip CMake-d526327079e23748dd2a87acd4d9b4b1174725bf.tar.gz CMake-d526327079e23748dd2a87acd4d9b4b1174725bf.tar.bz2 | |
Merge topic 'ninja-intel-depfile'
a624a3e1b3 Ninja: Use deps=gcc for Intel Compiler on Windows
f4f3b6b9af Ninja: Detect when ninja is new enough to support a multi-line depfile
699cd03212 Ninja: Drop unnecessary deptype customization infrastructure
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2893
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Platform/Windows-Intel-C.cmake | 2 | ||||
| -rw-r--r-- | Modules/Platform/Windows-Intel-CXX.cmake | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Modules/Platform/Windows-Intel-C.cmake b/Modules/Platform/Windows-Intel-C.cmake index 767fec5..06d8f50 100644 --- a/Modules/Platform/Windows-Intel-C.cmake +++ b/Modules/Platform/Windows-Intel-C.cmake @@ -1,2 +1,4 @@ include(Platform/Windows-Intel) __windows_compiler_intel(C) +set(CMAKE_NINJA_DEPTYPE_C intel) # special value handled by CMake +set(CMAKE_DEPFILE_FLAGS_C "-QMMD -QMT <OBJECT> -QMF <DEPFILE>") diff --git a/Modules/Platform/Windows-Intel-CXX.cmake b/Modules/Platform/Windows-Intel-CXX.cmake index 84cd303..666de6e 100644 --- a/Modules/Platform/Windows-Intel-CXX.cmake +++ b/Modules/Platform/Windows-Intel-CXX.cmake @@ -1,3 +1,5 @@ include(Platform/Windows-Intel) set(_COMPILE_CXX " /TP") __windows_compiler_intel(CXX) +set(CMAKE_NINJA_DEPTYPE_CXX intel) # special value handled by CMake +set(CMAKE_DEPFILE_FLAGS_CXX "-QMMD -QMT <OBJECT> -QMF <DEPFILE>") |