summaryrefslogtreecommitdiff
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-07-01 12:56:17 -0400
committerBrad King <brad.king@kitware.com>2021-07-01 13:04:16 -0400
commite93245ec64bec6e5f63388e4b4714c7a9d3cbf51 (patch)
treefa1a375211ded052fcd45dd4178c717d8e7ec09a /Modules
parente610e99ad34a545ac67f1977e78ea59a52fdcf79 (diff)
downloadcmake-e93245ec64bec6e5f63388e4b4714c7a9d3cbf51.tar.gz
DetermineCompiler: Restore identification of MSVC with no INCLUDE or LIB
Update the change from commit c6aaaf066a (DetermineCompiler: Restore identification of MSVC with no INCLUDE dirs, 2021-06-29, v3.21.0-rc2~6^2) to also work with no `LIB` dirs. Add the `-c` flag to compile an object file without linking.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/CMakeDetermineCCompiler.cmake3
-rw-r--r--Modules/CMakeDetermineCXXCompiler.cmake3
2 files changed, 4 insertions, 2 deletions
diff --git a/Modules/CMakeDetermineCCompiler.cmake b/Modules/CMakeDetermineCCompiler.cmake
index ca497f1f90..0f80f9cffc 100644
--- a/Modules/CMakeDetermineCCompiler.cmake
+++ b/Modules/CMakeDetermineCCompiler.cmake
@@ -88,7 +88,8 @@ else()
# 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__"
+ # Also avoid linking so this works with no LIB env var.
+ "-c -I__does_not_exist__"
)
endif()
if(CMAKE_C_COMPILER_TARGET)
diff --git a/Modules/CMakeDetermineCXXCompiler.cmake b/Modules/CMakeDetermineCXXCompiler.cmake
index e297f90b75..556518f496 100644
--- a/Modules/CMakeDetermineCXXCompiler.cmake
+++ b/Modules/CMakeDetermineCXXCompiler.cmake
@@ -83,7 +83,8 @@ else()
# 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__"
+ # Also avoid linking so this works with no LIB env var.
+ "-c -I__does_not_exist__"
)
endif()