Merge topic 'compiler-id-lang-vars'

c8eb357738 CompilerId: Tolerate variables named for languages

Acked-by: Kitware Robot <[email protected]>
Merge-request: !6243

Modules/CMakeCompilerIdDetection.cmake

@@ -13,8 +13,8 @@ endfunction()
 
 function(compiler_id_detection outvar lang)
 
-  if (NOT lang STREQUAL Fortran AND NOT lang STREQUAL CSharp
-      AND NOT lang STREQUAL ISPC)
+  if (NOT "x${lang}" STREQUAL "xFortran" AND NOT "x${lang}" STREQUAL "xCSharp"
+      AND NOT "x${lang}" STREQUAL "xISPC")
     file(GLOB lang_files
       "${CMAKE_ROOT}/Modules/Compiler/*-DetermineCompiler.cmake")
     set(nonlang CXX)
@@ -42,7 +42,7 @@ function(compiler_id_detection outvar lang)
 
     # Order is relevant here. For example, compilers which pretend to be
     # GCC must appear before the actual GCC.
-    if (lang STREQUAL CXX)
+    if ("x${lang}" STREQUAL "xCXX")
       list(APPEND ordered_compilers
         Comeau
       )
@@ -70,7 +70,7 @@ function(compiler_id_detection outvar lang)
       Fujitsu
       GHS
     )
-    if (lang STREQUAL C)
+    if ("x${lang}" STREQUAL "xC")
       list(APPEND ordered_compilers
         TinyCC
         Bruce
@@ -92,13 +92,13 @@ function(compiler_id_detection outvar lang)
       ADSP
       IAR
     )
-    if (lang STREQUAL C)
+    if ("x${lang}" STREQUAL "xC")
       list(APPEND ordered_compilers
         SDCC
       )
     endif()
 
-    if(lang STREQUAL CUDA)
+    if("x${lang}" STREQUAL "xCUDA")
       set(ordered_compilers NVIDIA Clang)
     endif()