From af8533459c60d7bc5b55f2f516251af4572169e4 Mon Sep 17 00:00:00 2001 From: Lasse Collin Date: Sun, 29 Sep 2024 01:20:03 +0300 Subject: [PATCH] CMake: Checking for CYGWIN covers MSYS2 too On MSYS2, both CYGWIN and MSYS are set. (cherry picked from commit 1c673c0aac7f7dee8dda2c1140351c8417a71e47) --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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