]> git.ipfire.org Git - thirdparty/xz.git/commitdiff
CMake: Checking for CYGWIN covers MSYS2 too
authorLasse Collin <lasse.collin@tukaani.org>
Sat, 28 Sep 2024 22:20:03 +0000 (01:20 +0300)
committerLasse Collin <lasse.collin@tukaani.org>
Tue, 1 Oct 2024 09:16:28 +0000 (12:16 +0300)
On MSYS2, both CYGWIN and MSYS are set.

(cherry picked from commit 1c673c0aac7f7dee8dda2c1140351c8417a71e47)

CMakeLists.txt

index dc01f00072a3ea2413339984e2343530cb2fa1b7..3a1462b81f9dd09891a141fb110d73c68666386f 100644 (file)
@@ -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