diff options
| author | Brad King <brad.king@kitware.com> | 2021-06-30 11:26:14 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-06-30 07:26:25 -0400 |
| commit | 249363f579ef508bd59ae2a7c40806bb86e062d4 (patch) | |
| tree | f282bf71a39e71131c3cba6324f4b4cea0f8c256 | |
| parent | fb02657b6a4f66cfb1b1673c170136f07945eda2 (diff) | |
| parent | c6aaaf066a39485bf34869ccae5b5d4fac04f0b9 (diff) | |
| download | cmake-249363f579ef508bd59ae2a7c40806bb86e062d4.tar.gz | |
Merge topic 'compiler-id-msvc-has-include' into release-3.21
c6aaaf066a DetermineCompiler: Restore identification of MSVC with no INCLUDE dirs
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6284
| -rw-r--r-- | Modules/CMakeDetermineCCompiler.cmake | 4 | ||||
| -rw-r--r-- | Modules/CMakeDetermineCXXCompiler.cmake | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Modules/CMakeDetermineCCompiler.cmake b/Modules/CMakeDetermineCCompiler.cmake index cd07ba983b..ca497f1f90 100644 --- a/Modules/CMakeDetermineCCompiler.cmake +++ b/Modules/CMakeDetermineCCompiler.cmake @@ -85,6 +85,10 @@ else() # ARMClang need target options "--target=arm-arm-none-eabi -mcpu=cortex-m3" + + # MSVC needs at least one include directory for __has_include to function, + # but custom toolchains may run MSVC with no INCLUDE env var and no -I flags. + "-I__does_not_exist__" ) endif() if(CMAKE_C_COMPILER_TARGET) diff --git a/Modules/CMakeDetermineCXXCompiler.cmake b/Modules/CMakeDetermineCXXCompiler.cmake index 3d1a7bba28..e297f90b75 100644 --- a/Modules/CMakeDetermineCXXCompiler.cmake +++ b/Modules/CMakeDetermineCXXCompiler.cmake @@ -80,6 +80,10 @@ else() # ARMClang need target options "--target=arm-arm-none-eabi -mcpu=cortex-m3" + + # MSVC needs at least one include directory for __has_include to function, + # but custom toolchains may run MSVC with no INCLUDE env var and no -I flags. + "-I__does_not_exist__" ) endif() |