cmake: clang detection tidy-ups

Follow-up to 0513f9f8786e0cc4246e05d56bd264d0292d9c92 #18645
Follow-up to fe5225b5eaf3a1a0ce149023d38a9922a114798b #18209

Closes #18659

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a0587327db5f02dd827f910e350c77e66b83a7b7..083c2f37b9c0e2e64681f46d89d9b25a8a07677a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -148,14 +148,12 @@ endif()
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
   string(APPEND _target_flags " GCC")
 endif()
-if(CMAKE_C_COMPILER_ID MATCHES "Clang")
-  if(CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
-    string(APPEND _target_flags " APPLE-CLANG")
-  elseif(MSVC)
-    string(APPEND _target_flags " CLANG-CL")
-  else()
-    string(APPEND _target_flags " LLVM-CLANG")
-  endif()
+if(CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
+  string(APPEND _target_flags " APPLE-CLANG")
+elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND MSVC)
+  string(APPEND _target_flags " CLANG-CL")
+elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
+  string(APPEND _target_flags " LLVM-CLANG")
 endif()
 if(MINGW)
   string(APPEND _target_flags " MINGW")

diff --git a/docs/examples/CMakeLists.txt b/docs/examples/CMakeLists.txt
index cb1d983890c698de7ba75ed46d4c1fcf3387a88f..bc0f3ce359b8630d3390ee18221ea8abb5538d44 100644 (file)
--- a/docs/examples/CMakeLists.txt
+++ b/docs/examples/CMakeLists.txt
@@ -37,7 +37,7 @@ foreach(_target IN LISTS check_PROGRAMS _all)  # keep '_all' last
       set(_examples_c "${check_PROGRAMS}")
       list(TRANSFORM _examples_c APPEND ".c")
       add_library(${_target_name} OBJECT EXCLUDE_FROM_ALL ${_examples_c})
-      if(MSVC AND NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")
+      if(CMAKE_C_COMPILER_ID STREQUAL "MSVC")  # MSVC but exclude clang-cl
         # CMake generates a static library for the OBJECT target. Silence these 'lib.exe' warnings:
         # warning LNK4006: main already defined in ....obj; second definition ignored
         # warning LNK4221: This object file does not define any previously undefined public symbols,