summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2024-02-13 13:55:16 (GMT)
committerKitware Robot <kwrobot@kitware.com>2024-02-13 13:55:25 (GMT)
commit0f5b2109e6cfd2a447508ecb6fa1e29c3d4e4965 (patch)
tree2efdc074dcc118efed86852e4850c5b0359a65ac
parent7f067a3c17f9f0d199013deab6c59f72837a531d (diff)
parent492f456c1c001ee3bfaf03bd124ea709ac878205 (diff)
downloadCMake-0f5b2109e6cfd2a447508ecb6fa1e29c3d4e4965.zip
CMake-0f5b2109e6cfd2a447508ecb6fa1e29c3d4e4965.tar.gz
CMake-0f5b2109e6cfd2a447508ecb6fa1e29c3d4e4965.tar.bz2
Merge topic 'clang-windows-make-depends' into release-3.29
492f456c1c Clang: Fix typo to enable compiler-generated Makefile dependencies on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9245
-rw-r--r--Modules/Platform/Windows-Clang-C.cmake2
-rw-r--r--Modules/Platform/Windows-Clang-CXX.cmake2
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/Platform/Windows-Clang-C.cmake b/Modules/Platform/Windows-Clang-C.cmake
index 322e3fb..a90e4b7 100644
--- a/Modules/Platform/Windows-Clang-C.cmake
+++ b/Modules/Platform/Windows-Clang-C.cmake
@@ -1,7 +1,7 @@
include(Platform/Windows-Clang)
__windows_compiler_clang(C)
-if("x${MAKE_C_COMPILER_FRONTEND_VARIANT}" STREQUAL "xMSVC")
+if("x${CMAKE_C_COMPILER_FRONTEND_VARIANT}" STREQUAL "xMSVC")
if((NOT DEFINED CMAKE_DEPENDS_USE_COMPILER OR CMAKE_DEPENDS_USE_COMPILER)
AND CMAKE_GENERATOR MATCHES "Makefiles|WMake"
AND CMAKE_DEPFILE_FLAGS_C)
diff --git a/Modules/Platform/Windows-Clang-CXX.cmake b/Modules/Platform/Windows-Clang-CXX.cmake
index b4aaf1e..af2a48f 100644
--- a/Modules/Platform/Windows-Clang-CXX.cmake
+++ b/Modules/Platform/Windows-Clang-CXX.cmake
@@ -2,7 +2,7 @@ include(Platform/Windows-Clang)
set(_COMPILE_CXX_MSVC " -TP")
__windows_compiler_clang(CXX)
-if("x${MAKE_CXX_COMPILER_FRONTEND_VARIANT}" STREQUAL "xMSVC")
+if("x${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}" STREQUAL "xMSVC")
if((NOT DEFINED CMAKE_DEPENDS_USE_COMPILER OR CMAKE_DEPENDS_USE_COMPILER)
AND CMAKE_GENERATOR MATCHES "Makefiles|WMake"
AND CMAKE_DEPFILE_FLAGS_CXX)