From: Lasse Collin Date: Sat, 28 Sep 2024 22:20:03 +0000 (+0300) Subject: CMake: Checking for CYGWIN covers MSYS2 too X-Git-Tag: v5.6.3~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af8533459c60d7bc5b55f2f516251af4572169e4;p=thirdparty%2Fxz.git CMake: Checking for CYGWIN covers MSYS2 too On MSYS2, both CYGWIN and MSYS are set. (cherry picked from commit 1c673c0aac7f7dee8dda2c1140351c8417a71e47) --- diff --git a/CMakeLists.txt b/CMakeLists.txt index dc01f000..3a1462b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -197,7 +197,7 @@ include(GNUInstallDirs) # # CMake 3.27 doesn't have CMAKE_RC_COMPILER_ID so we rely on # CMAKE_C_COMPILER_ID. -if((MINGW OR CYGWIN OR MSYS) AND ( +if((MINGW OR CYGWIN) AND ( NOT CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "17")) # Use workarounds with GNU windres and llvm-windres >= 17.0.0. The \x20