diff options
| author | Brad King <brad.king@kitware.com> | 2022-09-14 12:14:21 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-09-14 08:14:30 -0400 |
| commit | e457663ac15e138ce7618d2f74c9656665ab139b (patch) | |
| tree | 23d742c389fd4fef8d50b621d6c7debe2be3047e /Modules | |
| parent | 20f9b6973b533cd14beece126c9b76279a90ee4a (diff) | |
| parent | 90874a542e9d64d0a49326951defb2ed899bcbff (diff) | |
| download | cmake-e457663ac15e138ce7618d2f74c9656665ab139b.tar.gz | |
Merge topic 'Windows-Intel-dependencies'
90874a542e Intel classic compilers on Windows: use msvc style dependencies
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !7668
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Platform/Windows-Intel-C.cmake | 11 | ||||
| -rw-r--r-- | Modules/Platform/Windows-Intel-CXX.cmake | 11 |
2 files changed, 10 insertions, 12 deletions
diff --git a/Modules/Platform/Windows-Intel-C.cmake b/Modules/Platform/Windows-Intel-C.cmake index e4d9b93ee4..8ae6852932 100644 --- a/Modules/Platform/Windows-Intel-C.cmake +++ b/Modules/Platform/Windows-Intel-C.cmake @@ -19,9 +19,8 @@ if((NOT DEFINED CMAKE_DEPENDS_USE_COMPILER OR CMAKE_DEPENDS_USE_COMPILER) set(CMAKE_C_DEPENDS_USE_COMPILER TRUE) endif() -if("${CMAKE_SOURCE_DIR}${CMAKE_BINARY_DIR}" MATCHES " ") - # The Intel compiler does not properly escape spaces in a depfile. - # Fall back to msvc depfile format. - set(CMAKE_DEPFILE_FLAGS_C "/showIncludes") - set(CMAKE_C_DEPFILE_FORMAT msvc) -endif() +# The Intel compiler does not properly escape spaces in a depfile which can +# occur in source and binary cmake paths as well as external include paths. +# Until Intel fixes this bug, fall back unconditionally to msvc depfile format. +set(CMAKE_DEPFILE_FLAGS_C "/showIncludes") +set(CMAKE_C_DEPFILE_FORMAT msvc) diff --git a/Modules/Platform/Windows-Intel-CXX.cmake b/Modules/Platform/Windows-Intel-CXX.cmake index 6adbb6e193..e2fa2afaa4 100644 --- a/Modules/Platform/Windows-Intel-CXX.cmake +++ b/Modules/Platform/Windows-Intel-CXX.cmake @@ -20,9 +20,8 @@ if((NOT DEFINED CMAKE_DEPENDS_USE_COMPILER OR CMAKE_DEPENDS_USE_COMPILER) set(CMAKE_CXX_DEPENDS_USE_COMPILER TRUE) endif() -if("${CMAKE_SOURCE_DIR}${CMAKE_BINARY_DIR}" MATCHES " ") - # The Intel compiler does not properly escape spaces in a depfile. - # Fall back to msvc depfile format. - set(CMAKE_DEPFILE_FLAGS_CXX "/showIncludes") - set(CMAKE_CXX_DEPFILE_FORMAT msvc) -endif() +# The Intel compiler does not properly escape spaces in a depfile which can +# occur in source and binary cmake paths as well as external include paths. +# Until Intel fixes this bug, fall back unconditionally to msvc depfile format. +set(CMAKE_DEPFILE_FLAGS_CXX "/showIncludes") +set(CMAKE_CXX_DEPFILE_FORMAT msvc) |