]> git.ipfire.org Git - thirdparty/zlib-ng.git/commitdiff
Match CMAKE_GENERATOR_TOOLSET variable case-insensitive
authorDeniz Bahadir <deniz@code.bahadir.email>
Fri, 15 Sep 2023 16:23:27 +0000 (18:23 +0200)
committerHans Kristian Rosbach <hk-github@circlestorm.org>
Sat, 16 Sep 2023 09:12:01 +0000 (11:12 +0200)
The Visual Studio CMake generator allows to select different toolsets.
One of these toolsets is Clang-Cl.

However, the generator does accept the toolset name case-agnostic, so it
could be "ClangCl", but also "Clangcl" or "clangcl" or ...
This value will be stored verbatim in variable CMAKE_GENERATOR_TOOLSET
by CMake. Therefore, this variable must be matched case-insensitive,
which is what this commit does.

fixes: #1576

Signed-off-by: Deniz Bahadir <deniz@code.bahadir.email>
cmake/detect-intrinsics.cmake

index 04830fe613a7d97450ff0d49f833c8f69aeac055..1076bae1127d22d6a27ddcf5cd2204e11a75f236 100644 (file)
@@ -96,7 +96,7 @@ macro(check_avx512_intrinsics)
             # For CPUs that can benefit from AVX512, it seems GCC generates suboptimal
             # instruction scheduling unless you specify a reasonable -mtune= target
             set(AVX512FLAG "-mavx512f -mavx512dq -mavx512bw -mavx512vl")
-            if(NOT CMAKE_GENERATOR_TOOLSET MATCHES "ClangCl")
+            if(NOT CMAKE_GENERATOR_TOOLSET MATCHES "[Cc][Ll][Aa][Nn][Gg][Cc][Ll]")
                 check_c_compiler_flag("-mtune=cascadelake" HAVE_CASCADE_LAKE)
                 if(HAVE_CASCADE_LAKE)
                     set(AVX512FLAG "${AVX512FLAG} -mtune=cascadelake")
@@ -141,7 +141,7 @@ macro(check_avx512vnni_intrinsics)
     elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
         if(NOT NATIVEFLAG)
             set(AVX512VNNIFLAG "-mavx512f -mavx512dq -mavx512bw -mavx512vl -mavx512vnni")
-            if(NOT CMAKE_GENERATOR_TOOLSET MATCHES "ClangCl")
+            if(NOT CMAKE_GENERATOR_TOOLSET MATCHES "[Cc][Ll][Aa][Nn][Gg][Cc][Ll]")
                 check_c_compiler_flag("-mtune=cascadelake" HAVE_CASCADE_LAKE)
                 if(HAVE_CASCADE_LAKE)
                     set(AVX512VNNIFLAG "${AVX512VNNIFLAG} -mtune=cascadelake")