mirror of
https://github.com/Kitware/CMake.git
synced 2026-02-28 03:38:43 -06:00
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
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user