From: Deniz Bahadir Date: Fri, 15 Sep 2023 16:23:27 +0000 (+0200) Subject: Match CMAKE_GENERATOR_TOOLSET variable case-insensitive X-Git-Tag: 2.1.4~13 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3eb7cd2d8a5bc63f9fb65ad6f87912a562b523ec;p=thirdparty%2Fzlib-ng.git Match CMAKE_GENERATOR_TOOLSET variable case-insensitive 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 --- diff --git a/cmake/detect-intrinsics.cmake b/cmake/detect-intrinsics.cmake index 04830fe61..1076bae11 100644 --- a/cmake/detect-intrinsics.cmake +++ b/cmake/detect-intrinsics.cmake @@ -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")